# Conflicts: # Gemfile.lock # app/assets/stylesheets/custom.scss # app/controllers/application_controller.rb # app/controllers/applies_controller.rb # app/javascript/packs/application.js # app/views/layouts/_header.html.slim