Making a deliberate conflict
Make a conflict in master
Merged with conflict resolved
deliberate conflict
Conflict in master
Conflict resolved with testmerge