Resolving conflicts in schema