diff --git a/src/components/common/ButtonCommon/ButtonCommon.module.scss b/src/components/common/ButtonCommon/ButtonCommon.module.scss
index a7023aa05..70ab8f400 100644
--- a/src/components/common/ButtonCommon/ButtonCommon.module.scss
+++ b/src/components/common/ButtonCommon/ButtonCommon.module.scss
@@ -5,13 +5,7 @@
   display: flex;
   justify-content: center;
   align-items: center;
-<<<<<<< HEAD
-  // padding: 1.6rem 3.2rem;
-  padding: 0.8rem 1.6rem;
-  width: 100%;
-=======
   padding: 1.2rem 3.2rem;
->>>>>>> 499221a7b8217276dbba438808a6ad3ece216a4d
   &:disabled {
     filter: brightness(0.9);
     cursor: not-allowed;