fixed merge conflict in makefile