resolving conflict in schema