merged update