Update Makefile

Update conflicts