diff --git a/floatimg.h b/floatimg.h
index 6f20c35..9450db2 100644
--- a/floatimg.h
+++ b/floatimg.h
@@ -4,11 +4,7 @@
  *	http://la.buvette.org/photos/cumul
  */
 
-<<<<<<< HEAD
-#define		FIMG_VERSION	165
-=======
 #define		FIMG_VERSION	166
->>>>>>> c61251ad53e2b379dde2d441a55d3db0d93adf85
 
 /*
  *	in memory descriptor