diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7877f1b..5dc4d10 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 # Change Log
 
 All notable changes to this project will be documented in this file.
@@ -7,6 +6,3 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/),
 and this project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [1.0] - 2017-11-18
-=======
-[1.0]
->>>>>>> 13ec3a62ac71275ec2bbe0bbf993130e9f53589f