fix makefile merge