From fa80ad1f00b8626a091e61d1771dfaccf6a4e458 Mon Sep 17 00:00:00 2001
From: "vitess-bot[bot]" <108069721+vitess-bot[bot]@users.noreply.github.com>
Date: Tue, 24 Oct 2023 13:58:32 -0500
Subject: [PATCH] Cherry-pick fc921a6600db3efef5ff27c256150aebf02e721a with
 conflicts

---
 README.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.md b/README.md
index 075d4f64091..17df837a075 100644
--- a/README.md
+++ b/README.md
@@ -6,7 +6,11 @@
 
 # Vitess 
 
+<<<<<<< HEAD
 Test A
+=======
+Test B
+>>>>>>> fc921a6600 (Update README.md (#108))
 
 Vitess is a database clustering system for horizontal scaling of MySQL
 through generalized sharding.