diff --git a/src/other/firefox/Monterey/parts/toolbox.css b/src/other/firefox/Monterey/parts/toolbox.css
index 7a7494f..881eeae 100644
--- a/src/other/firefox/Monterey/parts/toolbox.css
+++ b/src/other/firefox/Monterey/parts/toolbox.css
@@ -39,13 +39,8 @@ findbar:-moz-window-inactive {
 }
 
 #titlebar {
-<<<<<<< HEAD
 	min-height: 0 !important
 	max-height: 48px !important;
-=======
-	min-height: 0 !important;
-	max-height: 36px !important;
->>>>>>> aa1efe3563d62b390a902b9bea4af15a361886c8
 }
 
 #TabsToolbar {