diff --git a/pub/CHANGELOG b/pub/CHANGELOG
index da04005299e566d694b4075bb977534a0c3a36a0..21e01340237e32ea66107b37d9ec13c8d9a3ee3b 100644
--- a/pub/CHANGELOG
+++ b/pub/CHANGELOG
@@ -1,12 +1,9 @@
-<<<<<<< HEAD:pub/CHANGELOG
 Release 2.1.3a
 
 - interface changes:
   - command modifier "=" (overwrite) must now be appended
   - calculator mode merged with main menu: FRIDA _is_ now a pocket calculator
 
-=======
->>>>>>> a727e4ea782628774cb72719f1fc30b59795a9d7:pub/CHANGELOG
 Release 2.1.2a of 20feb11:
 
 - new functionality: