fixed conflicts in Gemfile.lock and routes