Minor merge conflict fix.