diff --git a/packages/frontend/src/pages/admin/moderation.vue b/packages/frontend/src/pages/admin/moderation.vue
index 47db14513a..c5c9103516 100644
--- a/packages/frontend/src/pages/admin/moderation.vue
+++ b/packages/frontend/src/pages/admin/moderation.vue
@@ -98,7 +98,9 @@ const preservedUsernames = ref<string>('');
 const tosUrl = ref<string | null>(null);
 const privacyPolicyUrl = ref<string | null>(null);
 const trustedLinkUrlPatterns = ref<string>('');
+=======
 const inquiryUrl = ref<string | null>(null);
+>>>>>>> upstream/develop
 
 async function init() {
 	const meta = await misskeyApi('admin/meta');