merge conflict reso on gemfile.lock