Fix merge updates.