Gemfile conflict fixed