fix Makefile (remove leftover git conflicts)