update
merge Makefile