diff --git a/README.md b/README.md
index 36004d0..96e6933 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,5 @@
-<<<<<<< HEAD
 # Cloudtrailbeat
+An Elastic beat for cloudtrail w/ S3 -> SNS -> SQS
 
 Welcome to Cloudtrailbeat.
 
@@ -116,6 +116,3 @@ make release
 
 This will fetch and create all images required for the build process. The whole process to finish can take several minutes.
 =======
-# cloudtrailbeat
-An Elastic beat for cloudtrail w/ S3 -> SNS -> SQS
->>>>>>> 11dd3844af290305ab269a31907eb91497b8b2e4