Modify people.scss
Fix merge conflict