Resolve merge issues.