Stuff
Fixed merge conflicts