Your question is Git User Activity and Conflicts. 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 how you use Git to investigate user activity and resolve merge conflicts.