Update schema after all the merge conflicts