Rename combine() to merge()
Use 'this.' to make difference explicit for merge
Update for combine() rename
Add explicit numSamples() method

This is better than using xs.numSamples(), so we can switch out the
implementation later if needed.
Add 2D merge
Add test for merge operation
Use 'that' instead of 'other' (more specific)