makefile
fix merge