styling
fixed merge conflicts
fixed media query
changing copy