diff --git a/docs/sidebars.js b/docs/sidebars.js
index bdf82dff..cf93ab13 100644
--- a/docs/sidebars.js
+++ b/docs/sidebars.js
@@ -12,11 +12,8 @@ module.exports = {
       "behavior/layers",
       "behavior/misc",
       "behavior/mod-tap",
-<<<<<<< HEAD
       "behavior/reset",
-=======
       "behavior/tap-hold",
->>>>>>> 9a06bdb... feat(docs): add tap hold documentation
       "behavior/lighting",
     ],
     Development: [