Finish merge gemfile.lock