Resolve merge issues again.