prettify makefile
merge makefile