--- imach/src/ChangeLog	2023/04/29 10:53:23	1.63
+++ imach/src/ChangeLog	2023/04/29 10:53:45	1.64
@@ -1,4 +1,3 @@
-<<<<<<< ChangeLog
 2023-04-29  Nicolas Brouard  <brouard@ined.fr>
 
 	* imach.c (Module): Inverting the model equation and fixingg bugs