Correct Makefile
Merge Makefile