Gemfile.lock conflito