mv variables variables_overwrite
remove redundant variables
adapt scss to changes in master