Its not clear to me this is an actual problem. I just actually googled "how to fix a Git conflict" and not a single one has multiple paragraphs describing what things are.

The first result [0] pretty much immediately drops into what commands to run. If that result is part of the problem, I fully disagree it is a problem.

[0]: https://docs.github.com/en/pull-requests/collaborating-with-...