diff --git a/layouts/css/styles.styl b/layouts/css/styles.styl
index d671ef24c7ab..1521eb92a096 100644
--- a/layouts/css/styles.styl
+++ b/layouts/css/styles.styl
@@ -19,10 +19,6 @@
 @import 'page-modules/_prev-next-navigation'
 @import 'page-modules/_release-schedule'
 
-<<<<<<< HEAD
-=======
-
->>>>>>> 06d725074b56fa7a8978ae7e07694ee6eca7d3c6
 .intro
   margin-top 140px
   font-size 38px
@@ -41,13 +37,8 @@
 
 .has-side-nav
   aside
-<<<<<<< HEAD
-    width 200px
-    float left
-=======
     float left
     width 200px
->>>>>>> 06d725074b56fa7a8978ae7e07694ee6eca7d3c6
     margin-top 1.5em
 
     ul
@@ -89,7 +80,6 @@
 
 .full-width
   width 100%
-<<<<<<< HEAD
 
 .small
   font-size 10px
@@ -103,37 +93,15 @@ a:hover .color-lightgray
 .no-padding
   padding 0
 
-=======
-
-.small
-  font-size 10px
-
-.color-lightgray
-  color $light-gray
-
-a:hover .color-lightgray
-  color $white
-
-.no-padding
-  padding 0
-
->>>>>>> 06d725074b56fa7a8978ae7e07694ee6eca7d3c6
 .highlight-box
   background-color $light-gray3
   padding 5px 15px
   border-radius 2px
   margin-top 1em
-<<<<<<< HEAD
-
-  & *:first-child
-    margin-top 0.5rem
-  
-=======
 
   & *:first-child
     margin-top 0.5rem
 
->>>>>>> 06d725074b56fa7a8978ae7e07694ee6eca7d3c6
 html[dir="rtl"]
     .has-side-nav
       aside
@@ -141,11 +109,7 @@ html[dir="rtl"]
 
       article
         margin-right 220px
-<<<<<<< HEAD
-        margin-left 0
-=======
         margin-left 0px
->>>>>>> 06d725074b56fa7a8978ae7e07694ee6eca7d3c6
 
     @media screen and (max-width: 480px)
       .has-side-nav