merge makefile