diff --git a/docs/changelog.rst b/docs/changelog.rst
index a4a7fa9e..71f8e514 100644
--- a/docs/changelog.rst
+++ b/docs/changelog.rst
@@ -5,11 +5,8 @@ Changelog
 Changes in dev
 ==============
 
-<<<<<<< HEAD
-- Added spec file for rpm-based distributions
-=======
 - Updated ComplexFields so if required they won't accept empty lists / dicts
->>>>>>> listfield
+- Added spec file for rpm-based distributions
 - Fixed ListField so it doesnt accept strings
 - Added DynamicDocument and EmbeddedDynamicDocument classes for expando schemas