Made a bunch of stuff
added some stuff and merged conflicts