Styles and stuff
Fix merge conflicts