made changes to the merge