Fixed Gemfile conflict