diff --git a/css/styles.css b/css/styles.css
index 296c2ce..79e60e3 100644
--- a/css/styles.css
+++ b/css/styles.css
@@ -144,7 +144,36 @@ p {
   -moz-background-size: cover;
   background-size: cover;
   background-attachment: local;
+<<<<<<< HEAD
   color: #FFFFFF;
+=======
+  body {
+  animation: 10000ms ease-in-out infinite color-change;
+}
+
+@keyframes color-change {
+  0% {
+    background-color: teal;
+  }
+  20% {
+    background-color: gold;
+  }
+  40% {
+    background-color: indianred;
+  }
+  60% {
+    background-color: violet;
+  }
+  80% {
+    background-color: green;
+  }
+  100% {
+    background-color: teal;
+  }
+}
+
+  
+>>>>>>> 362401d662a29cb198c7c00b361d9d098c08fc9b
   padding-top: 70px;
   min-height: 100vh;
   letter-spacing: 2px;