fixed merge conflicts and schema