sass stuff
adding and mergin