Picking conflict - 002
Resolving conflict - 002