change the merge and update code