Changed the merge operation to create a new scope object on successful merge.

This makes things much simpler.
Merge branch 'topic-data-incrementalupdate' of github.com:abb-iss/SrcML.NET into topic-data-incrementalupdate