if we can't merge the diffs, favor the diff being transformed

wip