Update Makefile

fix conflicts