merged Makefile