update merge