diff --git a/jstrr.css b/jstrr.css
index ed70bde..372563a 100644
--- a/jstrr.css
+++ b/jstrr.css
@@ -1,12 +1,6 @@
-<<<<<<< HEAD
 body {
   background-color: rgb(142, 174, 235);
     background-image: url(snow.png);
-=======
-body:not(.secret) {/*background-color: rgb(142, 174, 235);*/
-    background-color: #F7CA53;
-    background-image: url(newyear2.jpg);
->>>>>>> d797f1b767ddeb716a03701087999008d9de78c6
     background-position: center;
     background-repeat: no-repeat;
     background-size: cover;