Nicola conflicts resolved
Nicola again