Rersolve remaining conflict

apps/app/src/interfaces/activity.ts

@@ -292,11 +292,7 @@ export const SupportedAction = {
   ACTION_ADMIN_MAIL_SES_UPDATE,
   ACTION_ADMIN_MAIL_TEST_SUBMIT,
   ACTION_ADMIN_FILE_UPLOAD_CONFIG_UPDATE,
-<<<<<<< HEAD
   ACTION_ADMIN_ATTACHMENT_DISPOSITION_UPDATE,
-  ACTION_ADMIN_QUESTIONNAIRE_SETTINGS_UPDATE,
-=======
->>>>>>> master
   ACTION_ADMIN_PAGE_BULK_EXPORT_SETTINGS_UPDATE,
   ACTION_ADMIN_MAINTENANCEMODE_ENABLED,
   ACTION_ADMIN_MAINTENANCEMODE_DISABLED,
@@ -494,11 +490,7 @@ export const LargeActionGroup = {
   ACTION_ADMIN_MAIL_SES_UPDATE,
   ACTION_ADMIN_MAIL_TEST_SUBMIT,
   ACTION_ADMIN_FILE_UPLOAD_CONFIG_UPDATE,
-<<<<<<< HEAD
   ACTION_ADMIN_ATTACHMENT_DISPOSITION_UPDATE,
-  ACTION_ADMIN_QUESTIONNAIRE_SETTINGS_UPDATE,
-=======
->>>>>>> master
   ACTION_ADMIN_PAGE_BULK_EXPORT_SETTINGS_UPDATE,
   ACTION_ADMIN_MAINTENANCEMODE_ENABLED,
   ACTION_ADMIN_MAINTENANCEMODE_DISABLED,