update after a merge