modify style
remove a tons of white spaces in scss
Resolved merge conflict in index and main.scss