Resolve some merge errors that louis missed