Resolved conflict in config/routes.rb on merge