diff --git a/styles.css b/styles.css
index 1aa1cd6..1eaee37 100644
--- a/styles.css
+++ b/styles.css
@@ -7,9 +7,8 @@ If your plugin does not need CSS, delete this file.
 
 */
 .float-search-modal {
-< < < < < < < HEAD width: 600 px;
-= = = = = = = width: 700 px;
->>> >>> > 285693757 c1023d96948f67c0ca5efe185cae1e8 padding-bottom: 0;
+	width: 700px;
+	padding-bottom: 0;
 }
 
 .float-search-modal.float-search-width {