grid tentative scss
merge conflict
updated index