chore: remove info from changelog

CHANGELOG.md

@@ -1,4 +1,3 @@
-<<<<<<< HEAD
 <a name="1.3.3"></a>
 ## 1.3.3 (2017-07-05)
 
@@ -20,12 +19,6 @@
 
 * build(yarn): add yarn.lock file ([827ff8f](https://github.com/auru/redux-unity-router/commit/827ff8f))
 * fix(routeToLocation): disable extended uri escaping ([62c9fc3](https://github.com/auru/redux-unity-router/commit/62c9fc3))
-=======
-<a name="1.4.0"></a>
-# 1.4.0 (2017-04-11)
-
-* feat: update src to React 15.5.0, update deps to green ([d6155d3](https://github.com/auru/redux-unity-router/commit/d6155d3))
->>>>>>> docs: update changelog
 * chore(package): update ava to version 0.18.1 ([4940f76](https://github.com/auru/redux-unity-router/commit/4940f76))
 * chore(package): update ava to version 0.19.0 ([182863e](https://github.com/auru/redux-unity-router/commit/182863e))
 * chore(package): update eslint-plugin-react to version 6.10.0 ([86f3650](https://github.com/auru/redux-unity-router/commit/86f3650))