diff --git a/README.md b/README.md
index 0791ee52..ccc824c1 100755
--- a/README.md
+++ b/README.md
@@ -15,8 +15,11 @@ Below you will find a changelog.
 
 (newest to oldest)
 
+<<<<<<< HEAD
 - fix responsiveness and mobile design
 - 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