diff --git a/src/scss/cdb-utilities/helpers.scss b/src/scss/cdb-utilities/helpers.scss
index 73e391a..1cb8a7b 100644
--- a/src/scss/cdb-utilities/helpers.scss
+++ b/src/scss/cdb-utilities/helpers.scss
@@ -30,11 +30,6 @@
 .u-lSpace--xl {
   margin-left: 12px;
 }
-<<<<<<< HEAD
-.u-bSpace--m {
-  margin-bottom: 8px;
-}
-=======
 .u-bSpace {
   margin-bottom: 4px;
 }
@@ -42,7 +37,6 @@
   margin-bottom: 8px;
 }
 
->>>>>>> ece198db8f1ecfae1a76ecaf706f2afebec3e0d9
 .u-iBlock {
   @include inline-block();
 }