I love rebasing.

As for dealing with merge conflicts, it's called

  - keep up to date with the branch your tracking
  - merge frequently
  - get on a call when you do have merge conflicts
  - avoid having multiple people working in the same files simultaneously if possible

The problem with merge conflicts is you have two people changing the same lines of code at the same time. So I would imagine if you wanted to improve the situation you would need an AI powered version control system that understood the intent of the previous developers. But that's not going to fix bad habits.