diff --git a/frappe/public/css/docs.css b/frappe/public/css/docs.css
index 1ad5b7e920..1f91e89944 100644
--- a/frappe/public/css/docs.css
+++ b/frappe/public/css/docs.css
@@ -236,10 +236,6 @@ body {
 }
 .toggle-sidebar {
   margin-right: 15px;
-<<<<<<< HEAD
-=======
-  border-color: #fff;
->>>>>>> 08ff129... added dropdown, disabled offcanvas in portal
 }
 .navbar-default .navbar-nav > li > a,
 .navbar-default .navbar-brand {