Moved merging to Merge.h