Fix a merge conflict in one of the Makefiles