a ton of styling stuff
resolve merge conflicts