diff --git a/CHANGELOG.md b/CHANGELOG.md
index e6763e1..cf0e478 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -10,13 +10,8 @@
      - Dub will then try to get the latest version number for each of these dependencies from code.dlang.org and automatically add them to the dependencies section of dub.json.
      - If it cant find the dependant package name, it will ignore it,
      - Current functionality is preserved whereby project type can be determined by using [vibe.d, deimos or minimal] after package name. (So example above would be dub init myProj vibe.d logger vibe-d gfm).
-<<<<<<< HEAD
          - Preferrable to use --type however, as this should be removed for next version.
     
-=======
-     - Preferrable to use --type however, as this should be removed for next version.
-
->>>>>>> origin/init-with-dependencies
 v0.9.22 - 2014-09-22
 --------------------