merge
fix makefile