Resolving conflicts in shortcodes.scss