Conflicts: - app/controllers/application_controller.rb Minor conflict due to glitch-soc's theming system