Checking Sass
Added some linked code
Checking SASS
Conflict resolve