merge Makefile fixed