Stuff
Fixed merging
Added stuff