diff --git a/README.md b/README.md
index 4baef2a3..87f15256 100644
--- a/README.md
+++ b/README.md
@@ -95,11 +95,7 @@ Use these variables to override the config.
 - Be able to specify environment information per playbook / per task
 - Schedule jobs
 - Email alerts
-<<<<<<< HEAD
->>>>>>> 1199a52... Update site layout
-=======
 - Multiple user support
->>>>>>> 7282f8a... Improve readme & Dockerfile
 
 ## Note to Ansible guys
 
@@ -109,4 +105,4 @@ It would be amazing if this could be your `Community Edition` of Ansible Tower.
 
 ## License
 
-MIT
\ No newline at end of file
+MIT