diff --git a/conf/config.json b/conf/config.json
index 61494d0..41c51fd 100644
--- a/conf/config.json
+++ b/conf/config.json
@@ -600,13 +600,9 @@
     "UseCaseOnboarding": true,
     "GraphQL": false,
     "InsightsEnabled": false,
-<<<<<<< Updated upstream
-    "CommandPalette": false
-=======
     "CloudFree": false,
     "CommandPalette": false,
     "AdvancedTextEditor": true
->>>>>>> Stashed changes
   },
   "ImportSettings": {
     "Directory": "./import",