get all the scss files corrected again
fixing merging problems