diff --git a/tools/read_obj.c b/tools/read_obj.c
index 4178ba1..9f1735d 100644
--- a/tools/read_obj.c
+++ b/tools/read_obj.c
@@ -20,13 +20,8 @@ if (2 != argc) {
 
 verbosity = 1;
 
-<<<<<<< HEAD
-foo = try_to_read_an_OBJ_file(argv[1], "bulles.xyz", 0);
-fprintf(stderr, "try to read '%s' --> %d\n", argv[1], foo);
-=======
 foo = try_to_read_an_OBJ_file(argv[1], "bubulles.asc", 0);
-fprintf(stderr, "try to read -> %d\n", foo);
->>>>>>> 457afac7c0a208413ff6a7f1d0932da76ecf685b
+fprintf(stderr, "try to read '%s' -> %d\n", argv [1], foo);
 
 return 0;
 }