Making a conflict (pt1)
Conflict (pt2)
Merge resolution