merged conflicts around discussion.scss