Made changes cause I'm cool
Fixed merge conflicts