proper merge of makefile