diff --git a/styles.css b/styles.css
index 40147bf..550d226 100755
--- a/styles.css
+++ b/styles.css
@@ -3740,12 +3740,8 @@ textarea:invalid, input:invalid {
     display: inline-block !important; }
 
 input:valid ~ i.ok {
-<<<<<<< HEAD
-  display: inline-block; }
-
-=======
   display: inline-block !important; }
->>>>>>> error
+
 input:valid ~ i.error {
   display: none !important; }