Merge failure fixed.