Update from merge