resolve merge conflict in schema