Github conflict resolution UI should switch to the diff3 conflict style

GitHub has a UI that can be used to resolve merge conflicts from the browser. Currently it uses the default conflict style used by git:

<<<<<<< hexagonrecursion-patch-1
>>>>>>> main

This makes the UI mostly useless as it does not present all the necessary information. Please change it to use the diff3 format instead. See git diff - Should diff3 be default conflictstyle on git? - Stack Overflow

Hi @hexagonrecursion ! Thanks for this feedback!
The conflict UI is not my favorite either.

We’re always working to improve GitHub and the GitHub Support Community, and we consider every suggestion we receive.
You can do so by submitting this through our official product feedback form so that our product team can track your request.

You can also keep an eye on our Changelog as well as the GitHub public roadmap to see features we are working on.