fixing Makefile after merge