fix makefile merging
fix makefile merging