Simplify the merge new content compare as it was too inefficient to be practical
Ctrl A to select all nodes (in whichever you click first) then you can hit Keep for it to save all to the file or overwrite as needed
Merge remote-tracking branch 'upstream/master'
Ctrl A to select all  + keep now works correctly