More merge failure.