update sass default
solve merge conflict