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
Merge pull request #879 from chrisleishman/merge_refactors

Move Merge from start to updates in the Query object