Merge editor shows conflicting lines and code lens together overlapping

[sandy081]

Testing #161833

• Create merge conflicts
• Open the conflicts file
• Open the merge editor
• Close the conflicts file and do not save

[hediet]

Close the conflicts file and do not save

This will restore the result file and re-introduce the conflict markers.

I'd say for now this is an unsupported scenarion, thus moving it to October.

[hediet]

I removed the conflict marker view zone, thus this should not happen anymore. Also see #162191