Resolve some post-merge errors.