Generating conflict - 004/A
Resolving conflict - 004