changed stuff
fixed conflict