add makefile
change makefile
change makefile
repair confilict