gemfile.lock merge conflict fix