diff --git a/ChangeLog b/ChangeLog
index b31c9fe1..828853c0 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -475,6 +475,9 @@ Task #2905: Unit tests: Clipboard classes
 Task #3072: Downgrade Linux build machines
 Task #3090: CXWindowsKeyState integ test args wrong
 <<<<<<< HEAD
+<<<<<<< HEAD
 
 =======
 >>>>>>> 2d76a4c5... Create ChangeLog
+=======
+>>>>>>> 2d76a4c5... Create ChangeLog