Update Gemfile.lock

fix merged confilict