diff --git a/docs/change-log.md b/docs/change-log.md
index ec73b8d8..e1b9e5da 100644
--- a/docs/change-log.md
+++ b/docs/change-log.md
@@ -36,7 +36,10 @@ Change log
 
 - Add support for docker contexts through `docker.ContextAPI`
 
+<<<<<<< HEAD
 
+=======
+>>>>>>> 7c4194c... Post release 4.2.0 update:
 4.1.0
 -----