More merge updates.