Fixes conflicted state

Fixes the conflicted state of styles.css. refs#68f98c