Well In this case I use a compare Editor like VS Code / VSC odium then open the conflict file with 'Toggle external editing' Button, doing the same for the Original file in VS Code use 'Select for Compare' fix the issue in the Original file and delete the conflict file.
But this should work as well Conflict Solution