# Conflicts:
#   app/views/layouts/_head.html.haml
#   config/webpack.config.js