fixed Makefile after merge