made changes
did the merge