Resolve multiple-column unique-constraint conflicts during merge.

Unit tests and documentation updates are pending.