Correct makefile
Trying to synchronize
Merged files