tours
conflict fixes