Gemfile.lock merge error