feat request: merge view removes conflict markers

[sf8193]

whenever I have a merge conflict it looks like this

the diff isn't 100% correct, as it doesn't highlight the differences between the left and right (with local in the middle), because of the conflict markers. In other scenarios it would correctly highlight that the second condition in the if, and the new parameter on the right like the below

Maybe i'm using a different git flow? If that's the case, would like to hear how you handle merge conflicts. I love the plugin/feature but find myself not using it on merge because i'm nervous about missing something within the actual conflict itself

When I delete the conflicts in local completely, i get a good view of the diff like so