diff --git a/src/css/main.css b/src/css/main.css
index 649380454..773895d46 100644
--- a/src/css/main.css
+++ b/src/css/main.css
@@ -1379,7 +1379,6 @@ input.ng-invalid-match, input.ng-invalid-match:focus {
   }
 }
 
-<<<<<<< a4ed15ab6f9cb6ec415196f24ddee81005a8f3d6
 /* Confirmation popup */
 
 .confirmTxModal {