sass stuff mostly
merge conflict