diff --git a/10/style.css b/10/style.css
index bc4b8b7..a924bf9 100644
--- a/10/style.css
+++ b/10/style.css
@@ -64,13 +64,10 @@ body
 <<<<<<< HEAD
   width:100%;
   background-color: #21632c;
-=======
-    font-family: "Roboto", sans-serif;
-      width:100%;
-  background-color: white;
->>>>>>> f088d357090d27adbb400e007445eee95f85116b
+  font-family: "Roboto", sans-serif;
+  width:100%;
   font-size: calc(8px + 0.7vw);
-  scrollbar-width: none;
+  scrollbar-width: 0px;
   border: none;
   margin-top: 0px;
    margin-bottom: 0px;