diff --git a/README.md b/README.md
index b269cf7a..afa7cd57 100755
--- a/README.md
+++ b/README.md
@@ -8,32 +8,7 @@ TellForm 2.1.0
 
 > An *opensource alternative to TypeForm* that can create [stunning mobile-ready forms](https://tellform.com/examples) , surveys and questionnaires.
 
-<<<<<<< HEAD
-Below you will find a changelog.
-
-## Changelog
-
-(newest to oldest)
-
-<<<<<<< HEAD
-<<<<<<< HEAD
-- fix responsiveness and mobile design
-=======
->>>>>>> parent of 2835280f... fix mobile responsiveness
-- fix form styling so it isn't terrible (use Raleway, change bg color)
-=======
->>>>>>> parent of 7afc7eef... update changelog
-- disable signups (turn on disable flag, hardcode in automatic 400 if the URL contains `signup`)
-- build in HTTPS support in `config/express.js`
-- fix JSEP import so form appears
-
-
-========
-========
-========
-=======
 [![Deploy](https://www.herokucdn.com/deploy/button.svg)](https://heroku.com/deploy?template=https://github.com/tellform/tellform/tree/master)
->>>>>>> parent of 623cb865... fix readme
 
 ## Table of Contents  
 
diff --git a/app/views/form.server.view.pug b/app/views/form.server.view.pug
index 47d0bd88..61bfffe8 100644
--- a/app/views/form.server.view.pug
+++ b/app/views/form.server.view.pug
@@ -35,31 +35,6 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
         background: url('/static/dist/page-loader.gif') 50% 35% no-repeat rgb(249,249,249);
         background-size: 50px 50px;
       }
-<<<<<<< HEAD
-      body {
-        font-family: 'Raleway' !important;
-      }
-      label.btn-default {
-        font-size: 14pt !important;
-        width: 10% !important;
-        padding-right: 30px;
-        background: none !important;
-        color: rgba(0,0,0,0.3) !important;
-        border-color: rgba(0,0,0,0.3) !important;
-      }
-      label.btn-default:hover, label.btn-default:visited, label.btn-default:active {
-        color: #000 !important;
-        background: none !important;
-        border-color: #000 !important;
-        font-weight: 400 !important;
-      }
-      .navbar { display: none !important; }
-      #submit_field {
-        height: auto !important; padding-bottom: 2% !important;
-      }
-
-=======
->>>>>>> parent of 45f8fe7a... fix form styling
     // Fav Icon 
     link(href='/static/modules/core/img/brand/favicon.ico', rel='shortcut icon', type='image/x-icon')
 
@@ -84,12 +59,9 @@ html(lang='en', xmlns='http://www.w3.org/1999/xhtml')
       script(type='text/javascript').
         socketUrl = "!{socketUrl}"
 
-<<<<<<< HEAD
     //JSEP
     script(src='https://cdn.jsdelivr.net/npm/jsep@0.3.4/build/jsep.min.js', type='text/javascript')
 
-=======
->>>>>>> parent of 78082f71... fix jsep import, add fillin for HTTPS server, remove debug flag
     script(src='/static/lib/jquery/dist/jquery.min.js', type='text/javascript')
     link(rel='stylesheet', href='/static/lib/font-awesome/css/font-awesome.min.css')
     link(rel='stylesheet', href='/static/lib/bootstrap/dist/css/bootstrap.min.css')