... and fix Makefile
fix merge conflict