SASS Restructure
Fixed merge confilct