made make file
merge