Picking conflict - 001
Resolving conflict - 001