diff --git a/ChangeLog b/ChangeLog
index b89cc14d3..5f84b3f4e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,3 @@
-<<<<<<< variant A
 2010-09-14  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
 	* SoObjects/Appointments/SOGoUserFolder+Appointments.m
@@ -6,7 +5,6 @@
 	the schedule-inbox-URL if the CAL is iCal and
 	the owner isn't the current user
 
->>>>>>> variant B
 2010-09-14  Wolfgang Sourdeau  <wsourdeau@inverse.ca>
 
 	* UI/Common/UIxPageFrame.m (-systemAdditionalJSFiles): new web
@@ -15,8 +13,6 @@
 	* SoObjects/SOGo/SOGoDomainDefaults.m (-additionalJSFiles): new
 	accessor for the new "SOGoUIAdditionalJSFiles" user default.
 
-####### Ancestor
-======= end
 2010-09-13  Ludovic Marcotte  <lmarcotte@inverse.ca>
 
         * Updated Ukrainian translation - patch from