added stuff
fixed conflict