diff --git a/jstrr.css b/jstrr.css
index 9b431e7..1f81745 100644
--- a/jstrr.css
+++ b/jstrr.css
@@ -77,11 +77,7 @@
 /*div.login, div.login2 {padding: 40% 0%;}*/
 div.login{
     background-color: rgb(142, 174, 235);
-<<<<<<< HEAD
     background-image: url(snow.png);
-=======
-    background-image: url(summer.jpg);
->>>>>>> master
     background-position: 10% 80%;
     background-repeat: no-repeat;
     background-size: cover;