Generating a conflict to resolve
Generating a conflict to resolve