Makefile merge