Gemfile changes
Gemfile conflicts fixed manually