deleted duplicate routes in the server.rb file
merge conflict