diff --git a/blockbase/assets/ponyfill.css b/blockbase/assets/ponyfill.css
index 98d02e9e53..1e3ad28c72 100644
--- a/blockbase/assets/ponyfill.css
+++ b/blockbase/assets/ponyfill.css
@@ -159,6 +159,10 @@ p {
 	margin-bottom: var(--wp--custom--margin--vertical);
 }
 
+.wp-block-column :first-child, .wp-block-group :first-child {
+	margin-top: 0;
+}
+
 .image-no-margin {
 	margin: 0;
 }
diff --git a/blockbase/sass/base/_text.scss b/blockbase/sass/base/_text.scss
index 47eecf9bf9..144a91ea42 100644
--- a/blockbase/sass/base/_text.scss
+++ b/blockbase/sass/base/_text.scss
@@ -10,4 +10,10 @@
 p {
 	margin-top: var(--wp--custom--margin--vertical);
 	margin-bottom: var(--wp--custom--margin--vertical);
-}
\ No newline at end of file
+}
+
+.wp-block-column, .wp-block-group {
+	:first-child {
+		margin-top: 0;
+	}
+}
diff --git a/skatepark/assets/theme.css b/skatepark/assets/theme.css
index 58e14e24b4..e9b9a3c8fd 100644
--- a/skatepark/assets/theme.css
+++ b/skatepark/assets/theme.css
@@ -43,11 +43,19 @@
 	color: var(--wp--preset--color--background);
 }
 
+<<<<<<< HEAD
+<<<<<<< HEAD
 p {
 	margin-top: calc( 0.5 * var(--wp--custom--margin--vertical));
 	margin-bottom: calc( 0.5 * var(--wp--custom--margin--vertical));
+=======
+.wp-block-column > p:first-child, .wp-block-column > h1:first-child, .wp-block-column > h2:first-child, .wp-block-column > h3:first-child, .wp-block-column > h4:first-child, .wp-block-column > h5:first-child, .wp-block-column > h6:first-child, .wp-block-group > p:first-child, .wp-block-group > h1:first-child, .wp-block-group > h2:first-child, .wp-block-group > h3:first-child, .wp-block-group > h4:first-child, .wp-block-group > h5:first-child, .wp-block-group > h6:first-child {
+	margin-top: 0;
+>>>>>>> Refactor text styles and add padding to groups w border.
 }
 
+=======
+>>>>>>> move group and column margin resets to blockbase
 .wp-block-post-author__content {
 	display: flex;
 	flex-direction: column;
diff --git a/skatepark/sass/base/_text.scss b/skatepark/sass/base/_text.scss
index 8a160c9798..0fafa0fab4 100644
--- a/skatepark/sass/base/_text.scss
+++ b/skatepark/sass/base/_text.scss
@@ -2,8 +2,3 @@
 ::selection {
 	color: var(--wp--preset--color--background);
 }
-
-p {
-	margin-top: calc( 0.5 * var(--wp--custom--margin--vertical) );
-	margin-bottom: calc( 0.5 * var(--wp--custom--margin--vertical) );
-}
\ No newline at end of file