Three-way merge that understands structure. Paste your Base, Ours, and Theirs — see semantic conflict detection in action. Runs entirely in your browser.
conflict markers
so you can resolve manually. JSON merges operate at the field level — different keys never conflict.