update Makefile
merge