Apply mergable scss rules with conflicts.

Open username-removed-408230 requested to merge ee-compat-mergeable-scss-rule into master

What does this MR do?

Are there points in the code the reviewer needs to double check?

Why was this MR needed?

Screenshots (if relevant)

Does this MR meet the acceptance criteria?

What are the relevant issue numbers?

EE Compatible Version of https://gitlab.com/gitlab-org/gitlab-ce/merge_requests/12810