Update Makefile

Update conflicts.