fixing scss merge issues