merging in edits from static css to sass