diff --git a/src/mesa/sources b/src/mesa/sources
index 9278ca88e9a..9a34d1a989f 100644
--- a/src/mesa/sources
+++ b/src/mesa/sources
@@ -299,9 +299,4 @@ COMMON_DRIVER_OBJECTS = $(COMMON_DRIVER_SOURCES:.c=.o)
 
 INCLUDE_DIRS = \
 	-I$(TOP)/include \
-<<<<<<< HEAD:src/mesa/sources
 	-I$(TOP)/src/mesa
-=======
-	-I$(TOP)/src/mesa \
-	-I$(TOP)/src/mesa/main
->>>>>>> master:src/mesa/sources