fixed merge conflict in schema