Move Merge from start to updates in the Query object

In preparation for MERGE for relationships and to ease the
work on the experimental parser
More work on MERGE for the experimental parser
Removes unused code