Forgotten merge conflict fix.