resolve merge conflicts with schema