merge conflict
add scss partials
style for rules page