Fix botched conflict fix.