diff --git a/ChangeLog b/ChangeLog
index 6ba42cf1b..7568dc44a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< variant A
 2012-02-02  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/MailerUI/UIxMailMainFrame.m (-composeAction): recipient
@@ -8,7 +7,6 @@
 	received "mailto" parameter is now a JSON-formatted string; we
 	parse it accordingly.
 
->>>>>>> variant B
 2012-02-03  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreSOGo.m (sogo_backend_create_root_folder):
@@ -49,8 +47,6 @@
 	* OpenChange/MAPIApplication.m (-setUserContext:): do not retain
 	the user context.
 
-####### Ancestor
-======= end
 2012-02-01  Francis Lachapelle  <flachapelle@inverse.ca>
 
 	* UI/WebServerResources/UIxCalUserRightsEditor.js (onUpdateACL):