add Makefile
resolved conflict