styles.css

merge conflict resolve