fixing merge conflict in makefile