Updated custom words to resolve merge conflict (#20833)

* Updated custom words to resolve merge conflict

* Updated custom words to resolve merge conflict

Co-authored-by: maulikjoshi <[email protected]>

custom-words.txt

@@ -9,6 +9,7 @@ aapl
 AATP
 abcxyz
 ABFS
+Abstractive
 ABGRABGR
 Accel
 ACCELCONTAINER
@@ -22,6 +23,7 @@ ACLs
 aclspec
 acquisitionid
 acrapi
+ACSS
 ACSSMS
 actionplans
 activedirectory
@@ -46,6 +48,7 @@ adultscore
 afd
 afdx
 affinitized
+AFRI
 AFRINIC
 agentpool
 aggregatedcost
@@ -175,6 +178,7 @@ authprovider
 authproviders
 Auths
 authsettings
+authtoken
 authsid
 autobackup
 Autocompletes
@@ -416,6 +420,7 @@ Coffeelake
 cognitiveservices
 colls
 colocation
+Cololocation
 COLUMNSTORE
 commandshistory
 commitmentplans
@@ -598,14 +603,18 @@ deserializer
 deserializing
 destaging
 destinationshares
+detectorproperties
 deterministically
 devcenter
 devcenters
+devbox
+devboxes
 devboxdefinitions
 deviceclass
 deviceclasses
 devicecredentials
 devicegroups
+deviceid
 deviceids
 deviceprovisioningservices
 devicestates
@@ -727,6 +736,7 @@ Eventhub
 eventhubconnections
 eventhubs
 eventroutes
+eventstream
 eventtime
 eventtypes
 EWDG
@@ -1130,6 +1140,7 @@ largefacelists
 largepersongroups
 lastfile
 lastmodified
+LATAM
 Latn
 l'avion
 LDAP
@@ -1150,6 +1161,7 @@ Liftr
 Linestring
 linkedservices
 linkexpiryinminutes
+linkworkspaces
 LISTAFTERID
 listbackups
 listbyrg
@@ -1231,8 +1243,11 @@ managementpartner
 managementpolicy
 manualupgrade
 mapbox
+mapconfiguration
+mapconfigurations
 mapred
 mapreduce
+Maputnik
 mariadb
 Marketo
 marketplaceagreementsapi
@@ -1454,6 +1469,7 @@ numa
 numofmessages
 numrecords
 nvarchar
+NVME
 Nynorsk
 nysiis
 OAEP
@@ -2124,6 +2140,7 @@ swedensouth
 switchprotection
 switzerlandnorth
 switzerlandwest
+synapselink
 Sybase
 Syncer
 syncfunctiontriggers
@@ -2184,6 +2201,7 @@ Tful
 Tfvc
 tilejson
 tileset
+tilesetconfiguration
 tilesets
 timeasc
 timedesc
@@ -2358,6 +2376,8 @@ virtualmachine
 virtualmachineimagebuilder
 virtualmachines
 virtualnetworkgateways
+virtualnetworkgatewaypolicygroups
+vngclientconnectionconfigurations
 virtualnetworkrules
 virtualnetworks
 Virtustream
@@ -2467,6 +2487,7 @@ workbooktemplates
 Workernode
 workitemsource
 workloadmonitor
+workspace
 workspaces
 workspace's
 wrapkey
@@ -2654,6 +2675,8 @@ verifyx
 removex
 generateverificationcodex
 favorited
+datawarehousequeries
+Dataware
 SIMIDs
 ICCID
 unversioned
@@ -2706,4 +2729,21 @@ Skolt
 Thangmi
 Tuvan
 Uyghur
+occured
+Occured
 Paramter
+Spza
+metallb
+kubevirt
+vmip
+xlargerc
+largerc
+mediumrc
+smallrc
+Autotune
+Showmount
+autogrid
+KubeProxyConfig
+IPVS
+TCPFIN
+taginheritance