change some stuff
fixed merge conflicts
fixed bug
fixed git messup