Merge conflict fix.