Update Makefile

Resolve Merge Conflicts