went through helper methods, partials, views, and styles
fixed merge conflict with partial on right rail