update conflict merge