diff --git a/content/en/hugo-pipes/js.md b/content/en/hugo-pipes/js.md
index c4d5f3ba4..9991a8a3c 100644
--- a/content/en/hugo-pipes/js.md
+++ b/content/en/hugo-pipes/js.md
@@ -40,6 +40,7 @@ Note that this is meant for small data sets, e.g. config settings. For larger da
 minify [bool]
 : Let `js.Build` handle the minification.
 
+<<<<<<< HEAD
 inject [slice] {{< new-in "0.81.0" >}}
 : This option allows you to automatically replace a global variable with an import from another file. The path names must be relative to `assets`.  See https://esbuild.github.io/api/#inject
 
@@ -74,6 +75,12 @@ sourceMap [string, bool] {{< new-in "0.75-DEV" >}}
 : Let `js.Build` output sourceMap. Current only inline is supported. true defaults to inline.
   One of: true, false, `inline`, `external`
   Default is false
+=======
+sourceMap [string] {{< new-in "0.75-DEV" >}}
+: Let `js.Build` output sourceMap. Current only inline is supported.
+  One of: "", `inline`, `external`
+  Default is ""
+>>>>>>> d280bedb7 (js.Build: Update docs to not allow boolean inputs for sourceMap)
 
 target [string]
 : The language target.