Is there any solution for a group of people working on a git merge conflict

Question

Let\'s assume a group of engineers working on a big project, let\'s say Android. They develop their own features and changes, and periodically merge AOSP.

Now problem