refactored sass partials
resolving merge conflicts