fixed conflicts in Gemfile