Resolved merge conflict (#20845)

Maulik003 · maulikjoshi · maulikjoshi · commit 3e66acd10d15 · 2022-10-04T14:39:05.000-07:00
Co-authored-by: maulikjoshi &lt;maulikjoshi@microsoft.com&gt;
diff --git a/custom-words.txt b/custom-words.txt
@@ -2781,4 +2781,4 @@ autogrid
 KubeProxyConfig
 IPVS
 TCPFIN
-taginheritance
+taginheritance
