final styling
resolving merge conflict
Merge branch 'stylestwo'