diff --git a/_sass/layout.scss b/_sass/layout.scss
index 809afb1..27f15e9 100644
--- a/_sass/layout.scss
+++ b/_sass/layout.scss
@@ -79,7 +79,6 @@
 
   @include mq(md) {
     background-color: $body-background-color;
-    border-bottom: $border $border-color;
   }
 
   .main-content {
diff --git a/package.json b/package.json
index 6582d05..beb4433 100644
--- a/package.json
+++ b/package.json
@@ -1,10 +1,6 @@
 {
   "name": "just-the-docs",
-<<<<<<< HEAD
-  "version": "1.0.0",
-=======
   "version": "0.1.6",
->>>>>>> fa40528acd2425f15e41759b94014a792403eabb
   "description": "A Jekyll theme for documentation",
   "repository": "pmarsceill/just-the-docs",
   "license": "MIT",