rearanged stuff
conflict fix