diff --git a/themes/default/css.php b/themes/default/css.php
index 1694c3aa22..23329fc73a 100644
--- a/themes/default/css.php
+++ b/themes/default/css.php
@@ -2027,10 +2027,7 @@ else { //default: white
 		resize: both;
 		}
 
-<<<<<<< Updated upstream
-=======
 	input.txt.login,
->>>>>>> Stashed changes
 	input.txt.login {
 		font-family: <?=$login_input_text_font?>;
 		font-size: <?=$login_input_text_size?>;
@@ -2074,14 +2071,6 @@ else { //default: white
 		<?php } ?>
 		}
 
-<<<<<<< Updated upstream
-	input.txt.login:hover {
-		border-color: <?=$login_input_border_color_hover?>;
-		}
-
-	input.txt.login:focus {
-		border-color: <?=$login_input_border_color_focus?>;
-=======
 	input.txt.login:hover,
 	input.txt.login:hover {
 		border: none !important;
@@ -2105,7 +2094,6 @@ else { //default: white
 		border-width: <?=$login_input_border_size?> !important;
 		border-style: <?=$login_input_border_style?> !important;
 		border-color: <?=$login_input_border_color_focus?> !important;
->>>>>>> Stashed changes
 		/* first clear */
 			-webkit-box-shadow: none;
 			-moz-box-shadow: none;
@@ -3894,4 +3882,4 @@ else { //default: white
 //output custom css
 echo $custom_css_code;
 
-?>
+?>
\ No newline at end of file