Your question is Resolving a High-Stakes Merge 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).
Tell me about a time your team ran into a complex Git branching or merge-conflict situation on a mobile project that put delivery at risk. How did you handle the conflict, align the people involved, and what was the outcome?