fix merge conflicts in schema