didn't Works on my machine wtf (now it does)

parser/src/combined.c

@@ -4056,6 +4056,8 @@ static unsigned ts_parser__condense_stack(TSParser *self)
 			}
 		}
 	}
+	if (made_changes)
+		(void)(made_changes);
 	return min_error_cost;
 }
 

parser/src/scanner.c

@@ -1,9 +1,4 @@
-<<<<<<< HEAD
 #include "./api.h"
-=======
-#include "./array.h"
-#include "./parser.h"
->>>>>>> master
 
 #include <assert.h>
 #include <ctype.h>