diff --git a/src/styles/_theme.scss b/src/styles/_theme.scss
index 05dafec..42e7aaf 100644
--- a/src/styles/_theme.scss
+++ b/src/styles/_theme.scss
@@ -21,6 +21,7 @@ $greyBlue: rgba(201, 215, 221, 1);
 $whiteYellow: rgba(255, 252, 245, 1);
 
 
+>>>>>>>>> Temporary merge branch 2
 /* some constants */
 
 $DESKTOP_WIDTH: 1160px;