Minor code cleanup; combined Merge and Merge2

There were temporarily two versions of Merge, to get the latest optimizations to work, but now that it works that part was cleaned up.