#4.1 - conflict fix