Your question is Resolve a Git Conflict. Take a moment with it on the right.
Talk me through your thinking if you like. When you're confident, submit your answer and I'll grade it like a real screen (7/10 or better passes).
If you were working in a team of three and encountered a significant Git conflict, what is your step-by-step process for resolution?