mergeconflictsimulation
Fix routes.rb root path conflict