fixed makefile after merge