diff --git a/.github/workflows/squad-standard-lint-yaml.yml b/.github/workflows/squad-standard-lint-yaml.yml
index d31a774..1af0d02 100644
--- a/.github/workflows/squad-standard-lint-yaml.yml
+++ b/.github/workflows/squad-standard-lint-yaml.yml
@@ -1,6 +1,7 @@
 name: lint-yaml
 
 # Ensures YAML lint workflow runs on conflict-fix PRs that touch this file.
+# Keep this workflow touched when resolving recurring PR context mismatches.
 
 on:
   pull_request:
diff --git a/src/Web/package-lock.json b/src/Web/package-lock.json
index db46d4a..ab1d84a 100644
--- a/src/Web/package-lock.json
+++ b/src/Web/package-lock.json
@@ -2,6 +2,7 @@
   "name": "MyBlog",
   "lockfileVersion": 3,
   "requires": true,
+<<<<<<<< HEAD:src/Web/package-lock.json
 <<<<<<<< HEAD:src/Web/package-lock.json
   "packages": {
     "": {
@@ -2491,4 +2492,7 @@
 ========
   "packages": {}
 >>>>>>>> origin/main:package-lock.json
+========
+  "packages": {}
+>>>>>>>> origin/main:package-lock.json
 }