diff --git a/client/assets/css/reset.scss b/client/assets/css/reset.scss
index 4ac74659..9402e71d 100644
--- a/client/assets/css/reset.scss
+++ b/client/assets/css/reset.scss
@@ -50,28 +50,15 @@
     --secondary: #466372;
     --emphasis-secondary: #466372;
     --light: #909090;
-<<<<<<< HEAD
-<<<<<<< HEAD
-    --super-light: #f4f4f4;
-=======
-    --super-light:  #F7F9FA;
->>>>>>> 801aef8... improvement (incremental): update colors and improve page when current folder is empty
-=======
     --super-light:  #f9fafc;
->>>>>>> 384b3e0... feature (Share): workable version for sharing
     --error: #f26d6d;
     --success: #63d9b1;
     --dark: #313538;
 }
 
 html {
-<<<<<<< HEAD
-    font-family: "San Francisco", "Roboto", "Arial", sans-serif;
-    -webkit-text-size-adjust: 100%;
-=======
     font-family: "Roboto", sans-serif;
     -webkit-text-size-adjust:100%;
->>>>>>> 801aef8... improvement (incremental): update colors and improve page when current folder is empty
     background: var(--bg-color);
     color: var(--color);
 }
@@ -205,4 +192,4 @@ select:-moz-focusring {
 
 .pointer {
     cursor: pointer;
-}
\ No newline at end of file
+}