diff --git a/ChangeLog b/ChangeLog
index db590ffb..b31c9fe1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -474,4 +474,7 @@ Feature #3119: Mac OS X secondary screen
 Task #2905: Unit tests: Clipboard classes
 Task #3072: Downgrade Linux build machines
 Task #3090: CXWindowsKeyState integ test args wrong
+<<<<<<< HEAD
 
+=======
+>>>>>>> 2d76a4c5... Create ChangeLog