changes and stuff
fixed merge conflicts