Fix merging of i-Tree code field

* When storing an i-Tree pair, use `(region, code)` instead of `(code, region)`
* When detecting diffs, use string version of i-Tree code field rather than pair version
* When displaying a diff, for the "imported value" use the value in the diff rather than the value in the row