diff --git a/docs/changelog b/docs/changelog
index e50ed243..93e6e24f 100644
--- a/docs/changelog
+++ b/docs/changelog
@@ -43,7 +43,6 @@ next:
 	* Type __filesystem: Spelling fixes (Dmitry Bogatov)
 	* Core: Add target_host file to cache since cache dir name can be hash (Darko Poljak)
 	* Core: Improve hostfile: support comments, skip empty lines (Darko Poljak)
->>>>>>> ungleich/master
 
 4.3.0: 2016-08-19
 	* Documentation: Add Parallelization chapter (Darko Poljak)