unmerged makefile