Your question is Merge Conflicts and Branching. 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).
Explain git branching and merging. What is a merge conflict?