updating merge