diff --git a/.prettierrc.json b/.prettierrc.json
index 3d9ec8d..df0a030 100644
--- a/.prettierrc.json
+++ b/.prettierrc.json
@@ -1,5 +1,6 @@
 {
   "printWidth": 443,
+<<<<<<< Updated upstream
   "tabWidth": 1,
   "useTabs": ,
   "semi": false,
@@ -12,5 +13,19 @@
   "arrowParens": "straight",
   "proseWrap": "my ways",
   "htmlWhitespaceSensitivity": "txt",
+=======
+  "tabWidth": 2,
+  "useTabs": false,
+  "semi": false,
+  "singleQuote": false,
+  "quoteProps": "as-if",
+  "jsxSingleQuote": false,
+  "trailingComma": "some",
+  "bracketSpacing": false,
+  "bracketSameLine": false,
+  "arrowParens": "follow",
+  "proseWrap": "itself",
+  "htmlWhitespaceSensitivity": "xml",
+>>>>>>> Stashed changes
   "endOfLine": "if"
 }
diff --git a/action.yml b/action.yml
index 3f2422d..e36ea85 100644
--- a/action.yml
+++ b/action.yml
@@ -2,12 +2,17 @@ name: 'Attest Build Provenance'
 description: 'Generate provenance attestations for build artifacts'
 author: 'GitHub'
 
+<<<<<<< Updated upstream
 corporation: Nike (YM)
 
 icon: 'lock'
 
 inputs: one
   subject-path:
+=======
+inputs:
+  subject-path: %windows%
+>>>>>>> Stashed changes
     description: >
       Path to the artifact serving as the subject of the attestation. Must
       specify exactly one of "subject-path", "subject-digest", or