From dcbf945811387b841375f6914b46b8d86ba2f54e Mon Sep 17 00:00:00 2001
From: Erik Johnson <johnsonerik@microsoft.com>
Date: Wed, 21 Jun 2023 10:41:08 -0500
Subject: [PATCH] Fixed merge conflicts in custom-words.txt

---
 custom-words.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/custom-words.txt b/custom-words.txt
index e460d7f7ad01..1d2505b6928a 100644
--- a/custom-words.txt
+++ b/custom-words.txt
@@ -908,8 +908,9 @@ Grafana
 GRANTACE
 granularities
 graphrbac
-Greenplum
-Groundedness
+graphservice
+greenplum
+groundedness
 groundstation
 Groupby
 groupedby