changed preProcess behaviour
fix conflicts