diff --git a/_embed/public/css/styles.css b/_embed/public/css/styles.css
index c95d20a4..5cf7a8dc 100644
--- a/_embed/public/css/styles.css
+++ b/_embed/public/css/styles.css
@@ -564,11 +564,7 @@ header .actions {
 
 #bottom-bar>*:first-child {
     margin-right: auto;
-<<<<<<< HEAD
     max-width: calc(100% - 25em);
-=======
-    max-width: calc(100% - 24em);
->>>>>>> cb77ca979b94519ce5afc5ea25e33cd44732e1d8
     width: 100%;
 }