resolved conflict from cherry pick
resolved conflict from cherry pick
Gemfile.lock update