Generating conflict - 003/B
Resolving conflict - 003