Cleanup merge conflict in Applications/util/makefile