fix Makefile merge