diff --git a/frontend/src/components/Overview/CardUserSearch.vue b/frontend/src/components/Overview/CardUserSearch.vue
index 2c202597f..9d126e899 100644
--- a/frontend/src/components/Overview/CardUserSearch.vue
+++ b/frontend/src/components/Overview/CardUserSearch.vue
@@ -33,16 +33,11 @@
               >
                 {{ $t('card-user-search.allowed.disabled-button') }}
               </BButton>
-              <BButton
-                v-else
-                variant="gradido"
-                :href="gmsUri"
-                target="_blank"
-              >
+              <BButton v-else variant="gradido" :href="gmsUri" target="_blank">
                 {{ $t('card-user-search.allowed.button') }}
               </BButton>
             </div>
-            <div v-else> 
+            <div v-else>
               <RouterLink to="/settings/extern">
                 <BButton variant="gradido">
                   {{ $t('card-user-search.not-allowed.button') }}
@@ -67,11 +62,17 @@ const { toastError } = useAppToast()
 const store = useStore()
 
 const gmsUri = ref('not initialized')
-console.log('store.state: gmsAllowed userLocation=', store.state.gmsAllowed, store.state.userLocation)
+/*
+console.log(
+  'store.state: gmsAllowed userLocation=',
+  store.state.gmsAllowed,
+  store.state.userLocation,
+)
+*/
 const gmsAllowed = store.state.gmsAllowed
-console.log('gmsAllowed=', gmsAllowed)
+// console.log('gmsAllowed=', gmsAllowed)
 const gmsUserLocationExists = store.state.userLocation !== null
-console.log('gmsUserLocationExists=', gmsUserLocationExists)
+// console.log('gmsUserLocationExists=', gmsUserLocationExists)
 const isUserSearchDisabled = computed(() => gmsUri.value !== null)
 
 const { onResult, result, loading, onError } = useQuery(authenticateGmsUserSearch)
diff --git a/frontend/src/components/UserSettings/UserGMSLocationFormat.vue b/frontend/src/components/UserSettings/UserGMSLocationFormat.vue
index 6b65ec222..203802a03 100644
--- a/frontend/src/components/UserSettings/UserGMSLocationFormat.vue
+++ b/frontend/src/components/UserSettings/UserGMSLocationFormat.vue
@@ -26,9 +26,9 @@ const store = useStore()
 const { toastError, toastSuccess } = useAppToast()
 
 const selectedOption = ref(
-  store.state.gmsPublishLocation === 'GMS_LOCATION_TYPE_RANDOM' ? 
-  'GMS_LOCATION_TYPE_APPROXIMATE' : 
-  store.state.gmsPublishLocation
+  store.state.gmsPublishLocation === 'GMS_LOCATION_TYPE_RANDOM'
+    ? 'GMS_LOCATION_TYPE_APPROXIMATE'
+    : store.state.gmsPublishLocation,
 )
 const dropdownOptions = [
   {
diff --git a/frontend/src/pages/Overview.vue b/frontend/src/pages/Overview.vue
index 311901e8f..a515cbd88 100644
--- a/frontend/src/pages/Overview.vue
+++ b/frontend/src/pages/Overview.vue
@@ -28,13 +28,11 @@ export default {
   },
   computed: {
     isGmsActive() {
-      console.log('isGmsActive=', CONFIG.GMS_ACTIVE)
       return CONFIG.GMS_ACTIVE === true
     },
     isHumhubActive() {
-      console.log('isHumhubActive=', CONFIG.HUMHUB_ACTIVE)
       return CONFIG.HUMHUB_ACTIVE === true
     },
-  }
+  },
 }
 </script>
diff --git a/frontend/src/pages/Settings.vue b/frontend/src/pages/Settings.vue
index 72858ea32..50b61b8cb 100644
--- a/frontend/src/pages/Settings.vue
+++ b/frontend/src/pages/Settings.vue
@@ -238,24 +238,10 @@ const isHumhubActivated = computed(() => {
   return humhubAllowed.value === true
 })
 
-<<<<<<< HEAD
-const isGMS = computed(() => {
-  return CONFIG.GMS_ACTIVE === true
-})
-
-const isHumhub = computed(() => {
-  return CONFIG.HUMHUB_ACTIVE === true
-})
-
-const isCommunityService = computed(() => {
-  return isGMS.value || isHumhub.value
-})
-=======
 // setting if gms and/or humhub are enabled in frontend config .env
 const isGMS = CONFIG.GMS_ACTIVE
 const isHumhub = CONFIG.HUMHUB_ACTIVE
 const isCommunityService = isGMS || isHumhub
->>>>>>> ed90d6ae7ffa23a6d5c073a5d7bc3c42668fc51d
 
 const { mutate: updateUserData } = useMutation(updateUserInfos)