Resolve some merge conflicts