CE upstream
Unmerged paths:
(use "git add <file>..." to mark resolution)
both modified: app/assets/javascripts/dispatcher.js
both modified: config/routes/project.rb
both modified: config/webpack.config.js
both modified: features/steps/project/project.rb