Need to handle large merge conflicts more gracefully

[fuzyll]

A performance optimization we made in the past was to truncate large diffs to avoid loading megabytes of JSON in the merge conflict resolver.

Once #5720 is done, we may be able to remove this limitation since we won't be operating on JSON for these objects anymore.