merge
fix Makefile