diff --git a/include/fsm.h b/include/fsm.h
index a7c6850..791ede8 100644
--- a/include/fsm.h
+++ b/include/fsm.h
@@ -261,9 +261,5 @@ typedef struct fsm_struct_list_tool {
     struct fsm_struct_list_tool *suiv;    /**< *suiv    phantom documentation */
 } fsm_struct_list_tool ;
 
-<<<<<<< HEAD
-
-=======
 void fsm_tools_list_test();
->>>>>>> 5c5eb4b (WIP: memory leaks fsm/measures/tools fsm_tools_list_test() < OK)
 
diff --git a/src/fsm/measures/data.c b/src/fsm/measures/data.c
index 957fb5a..6580b61 100644
--- a/src/fsm/measures/data.c
+++ b/src/fsm/measures/data.c
@@ -45,11 +45,7 @@
  * @param *p_data
  * @param *p_target
  */
-<<<<<<< HEAD
-void fsm_add_data (fsm_struct_list_data d, int *p_data, int *p_target) {}
-=======
 void fsm_add_data (fsm_struct_list_tool d, int *p_data, int *p_target) {}
->>>>>>> 5c5eb4b (WIP: memory leaks fsm/measures/tools fsm_tools_list_test() < OK)
 
 /**
  * phantom documentation
@@ -58,11 +54,7 @@ void fsm_add_data (fsm_struct_list_tool d, int *p_data, int *p_target) {}
  * @param from
  * @param to
  */
-<<<<<<< HEAD
-int  fsm_get_data (fsm_struct_list_data d, int from, int to) {return 0;}
-=======
 int  fsm_get_data (fsm_struct_list_tool d, int from, int to) {return 0;}
->>>>>>> 5c5eb4b (WIP: memory leaks fsm/measures/tools fsm_tools_list_test() < OK)
 
 /**
  * phantom documentation
@@ -70,9 +62,5 @@ int  fsm_get_data (fsm_struct_list_tool d, int from, int to) {return 0;}
  * @param d
  * @param *p_data
  */
-<<<<<<< HEAD
-void fsm_remove_data (fsm_struct_list_data d, int *p_data) {}
-=======
 void fsm_remove_data (fsm_struct_list_tool d, int *p_data) {}
->>>>>>> 5c5eb4b (WIP: memory leaks fsm/measures/tools fsm_tools_list_test() < OK)