fix merge conflict
fix Makefile
fix Makefile