diff --git a/tests/Makefile b/tests/Makefile
index 1782ea6..d4a3651 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -2,8 +2,13 @@ INCLUDES = -I..
 CFLAGS = -Wno-pointer-to-int-cast -Wno-int-to-pointer-cast -DSTB_DIVIDE_TEST
 CPPFLAGS = -Wno-write-strings -DSTB_DIVIDE_TEST
 
+<<<<<<< HEAD
 # Uncomment this line for reproducing OSS-Fuzz bugs with image_fuzzer
 #CFLAGS += -O -fsanitize=address 
+=======
+# Uncomment this for reproducing OSS-Fuzz bugs
+#CFLAGS += -O -fsanitize=address
+>>>>>>> d1d0e9fdb078cbc27f406607dcee775645270e2b
 
 all:
 	$(CC) $(INCLUDES) $(CFLAGS) ../stb_vorbis.c test_c_compilation.c test_c_lexer.c test_dxt.c test_easyfont.c test_image.c test_image_write.c test_perlin.c test_sprintf.c test_truetype.c test_voxel.c -lm