Handle conflicting columns when merging rows.
Add tests for sharded reads