restored Makefile
merge finished