diff --git a/styles.css b/styles.css
index 95664b35e0152abc0b379c7f065a3cbfdf109ee2..e2fedc5a7d2646027601f650ed35973d7eaaf934 100644
--- a/styles.css
+++ b/styles.css
@@ -445,4 +445,8 @@ button:hover{
 @keyframes fade {
   from {opacity: .4}
   to {opacity: 1}
+<<<<<<< HEAD
 }
+=======
+}
+>>>>>>> ouma