Fixed some damaged files

removed <<<<<<< Items that GITHUB added from functions and custom sass
file