starting conflict simualtion
Master branch solved conflict