Practice merge w/ minor SCSS changes