diff --git a/lms/static/sass/course/base/_extends.scss b/lms/static/sass/course/base/_extends.scss
index 9604a6a..f04d879 100644
--- a/lms/static/sass/course/base/_extends.scss
+++ b/lms/static/sass/course/base/_extends.scss
@@ -37,11 +37,7 @@ h1.top-header {
 .content {
   @include box-sizing(border-box);
   display: table-cell;
-<<<<<<< HEAD
   padding: 2em 2.5em;
-=======
-  padding-right: lh();
->>>>>>> master
   vertical-align: top;
   width: flex-grid(9) + flex-gutter();