New Makefile
Fix merge