merge Makefile