:Added a new scss file main.scss
:Resolved conflict