settled merge conflict in schema