Checking how conflicts work
Resolved conflicts