Resolve conflict in MkExternalCore