Setup to resolve merge conflicts.