Resolve some merge issues