fixed merge conflicts in schema