Conflict commit B
Conflict resolution