diff --git a/package.json b/package.json
index c6bbd503d4..6d8f1ce24c 100644
--- a/package.json
+++ b/package.json
@@ -107,6 +107,10 @@
     "*.js": [
       "eslint --fix",
       "git add"
+    ],
+    "*.{js,json,css,md}": [
+      "prettier --write",
+      "git add"
     ]
   },
   "husky": {
diff --git a/website/sidebars.json b/website/sidebars.json
index 0051dfa7e4..27993126bd 100644
--- a/website/sidebars.json
+++ b/website/sidebars.json
@@ -1,9 +1,5 @@
 {
   "documentation": {
-<<<<<<< HEAD
-    "User documentation": ["getting_started", "client_sdk", "securing_unleash", "unleash_context", "activation_strategy", "client_specification", "migration_guide"],
-    "Developer Guide": ["developer_guide", "database_schema", "database_backup"],
-=======
     "Getting Started": [
       "getting_started",
       "securing_unleash",
@@ -17,7 +13,6 @@
       "database_schema",
       "database_backup"
     ],
->>>>>>> chore: Fix formatting all the things
     "Guides": ["guides/google_auth"]
   },
   "api": {