updated the merge changes