Fix Conflicts in Makefile