diff --git a/ChangeLog b/ChangeLog
index 2ea57bdc1..8eca5567f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< variant A
 2012-01-27 Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/Appointments/SOGoAppointmentFolder.m
@@ -9,7 +8,6 @@
 	(_folderCalenars) - we now ask for the c_content and use
 	a local autorelease pool to avoid consuming too much memory
 
->>>>>>> variant B
 2012-01-26  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* OpenChange/MAPIStoreCommonViewsContext.[hm],
@@ -38,8 +36,6 @@
 	(+listContextsForUser:inMemCtx:): new individual method invoked by
 	the above. Overridden by concrete subclasses.
 
-####### Ancestor
-======= end
 2012-01-26 Ludovic Marcotte  <lmarcotte@inverse.ca>
 
     * SoObjects/SOGo/LDAPSource.{h,m} - now honor