Resolved conflicts

.github/ISSUE_TEMPLATE/Bug_Report.yml

@@ -9,8 +9,8 @@ body:
         > **Important: When reporting BSODs or security issues, DO NOT attach memory dumps, logs, or traces to GitHub issues**.
         > Instead, send dumps/traces to secure@microsoft.com, referencing this GitHub issue.
         >
-        > If this is an application crash, please also provide a Feedback Hub submission link if at all possible so we can find your diagnostic data on the backend.
-        > You can open the Feedback Hub directly to the pre-populated form at https://aka.ms/winget-feedback
+        > If this is an application crash, please provide a Feedback Hub submission link if possible so we can find your diagnostic data on the backend.
+        > You can open the Feedback Hub directly to the prepopulated form at https://aka.ms/winget-feedback
         > Alternatively, use the category "Apps > Windows Package Manager" and choose "Share My Feedback" after submission to get the link.
         >
         > Please use this form and describe your issue, concisely but precisely, with as much detail as possible.

.github/actions/spelling/README.md

@@ -14,4 +14,4 @@ File | Purpose | Format | Info
 [advice.md](advice.md) | Supplement for GitHub comment when unrecognized words are found | GitHub Markdown | [advice](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples%3A-advice)
 
 Note: you can replace any of these files with a directory by the same name (minus the suffix)
-and then include multiple files inside that directory (with that suffix) to merge multiple files together.
+and then include multiple files inside that directory (with that suffix) to merge multiple files.

.github/actions/spelling/advice.md

@@ -14,7 +14,9 @@ https://www.regexplanet.com/advanced/perl/) yours before committing to verify it
 
 * well-formed pattern.
 
-  If you can write a [pattern](https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns) that would match it,
+  If you can write a [pattern](
+https://github.com/check-spelling/check-spelling/wiki/Configuration-Examples:-patterns
+) that would match it,
   try adding it to the `patterns.txt` file.
 
   Patterns are Perl 5 Regular Expressions - you can [test](
@@ -23,3 +25,6 @@ https://www.regexplanet.com/advanced/perl/) yours before committing to verify it
   Note that patterns can't match multiline strings.
 
 </details>
+<!--
+template: check-spelling
+-->

.github/actions/spelling/allow.txt

@@ -17,7 +17,9 @@ appxsdk
 APSTUDIO
 ARRAYSIZE
 artifactstagingdirectory
+Asn
 aspirational
+Authenticode
 AUTOLISTEN
 azureedge
 binlog
@@ -40,8 +42,7 @@ COMMANDBARFLYOUT
 COMMONDATA
 comparand
 conemu
-contosa
-contosainstaller
+contoso
 COSTDEFERRED
 cotaskmem
 cpprest
@@ -69,6 +70,7 @@ denelon
 depersist
 differentpath
 DIRECTONLY
+DISMAPI
 distro
 dllmain
 dotnet
@@ -143,6 +145,7 @@ INVALIDARG
 INVALIDSID
 iot
 IPinning
+ipmo
 IPortable
 ISAPPROVEDFOROUTPUT
 IUnknown
@@ -163,6 +166,7 @@ MAKEINTRESOURCE
 makemsix
 MANIFESTSCHEMA
 MANIFESTVERSION
+meme
 metadatas
 Minimatch
 Moq
@@ -194,6 +198,7 @@ norestart
 normalizednameandpublisher
 normalizedpackagenameandpublisher
 notcontains
+NTAPI
 NTSTATUS
 nullsoft
 nunit
@@ -209,6 +214,9 @@ packagefamilyname
 packageidentifier
 packagename
 PACKAGESSCHEMA
+paket
+Params
+params
 parentidx
 pathpart
 Pathto
@@ -224,11 +232,14 @@ pinningindex
 pipssource
 Pkcs
 portableindex
+powertoys
 pplx
 ppv
 PRECONFIG
 preindexed
 prepareforpackaging
+prepopulate
+prepopulated
 prioritization
 processthreadsapi
 PRODUCTNAME
@@ -251,6 +262,7 @@ removemanifest
 removepin
 removeportablefile
 repolibtest
+requeue
 rescap
 resetpins
 resheader
@@ -287,6 +299,7 @@ SHTDN
 shtypes
 signtool
 silentwithprogress
+Silverlight
 simplesave
 simpletest
 sln
@@ -330,7 +343,7 @@ Testrun
 testsettingname
 TEXTFORMAT
 TEXTINCLUDE
-Threadpool
+threadpool
 tpl
 TRACELOGGING
 triaged
@@ -371,6 +384,7 @@ vcvars
 vcxitems
 VERYSILENT
 VFT
+visualstudio
 VOS
 vso
 wapproj