adding styling stuff
resolving merge conflicts