diff --git a/src/assets/styles/components/myButton.module.scss b/src/assets/styles/components/myButton.module.scss
index b4a438f..9300045 100644
--- a/src/assets/styles/components/myButton.module.scss
+++ b/src/assets/styles/components/myButton.module.scss
@@ -30,7 +30,6 @@
     &:hover {
       border: 1px solid rgba(0, 0, 0, 0.3);
     }
-<<<<<<< HEAD
     &__green {
         color: white;
         background-color: rgb(150, 209, 158);
@@ -53,8 +52,5 @@
             transition: 0.3s;
         }
     }
-}
-=======
   }
-}
->>>>>>> 750b571374c05b915d136af481fe93bf966bac39
+}
\ No newline at end of file