diff --git a/.gitattributes b/.gitattributes
index c61cc555de..1fc6acc943 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,7 +1,7 @@
 *.ipynb linguist-detectable=false
 *.html linguist-detectable=false
 eia861-transform.ipynb merge=ours
-environments/conda-*lock.yml merge=ours
+environments/conda-*lock.yml merge=ours linguist-generated=true
 *.csv text
 *.py text
 *.json text
diff --git a/environments/conda-linux-64.lock.yml b/environments/conda-linux-64.lock.yml
index b45e606241..259d65cc71 100644
--- a/environments/conda-linux-64.lock.yml
+++ b/environments/conda-linux-64.lock.yml
@@ -465,7 +465,7 @@ dependencies:
   - h3-py=3.7.6=py311hb755f60_1
   - httpx=0.25.2=pyhd8ed1ab_0
   - identify=2.5.32=pyhd8ed1ab_0
-  - ipython=8.18.1=pyh31011fe_1
+  - ipython=8.18.1=pyh31011fe_2
   - isoduration=20.11.0=pyhd8ed1ab_0
   - jsonschema=4.20.0=pyhd8ed1ab_0
   - jupyter_client=8.6.0=pyhd8ed1ab_0
diff --git a/environments/conda-lock.yml b/environments/conda-lock.yml
index f3a4470731..cf17a4cbab 100644
--- a/environments/conda-lock.yml
+++ b/environments/conda-lock.yml
@@ -8533,16 +8533,16 @@ package:
       matplotlib-inline: ""
       pexpect: ">4.3"
       pickleshare: ""
-      prompt-toolkit: ">=3.0.30,<3.1.0,!=3.0.37"
+      prompt-toolkit: ">=3.0.41,<3.1.0"
       pygments: ">=2.4.0"
       python: ">=3.9"
       stack_data: ""
       traitlets: ">=5"
       typing_extensions: ""
-    url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_1.conda
+    url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.conda
     hash:
-      md5: ac2f9c2e10c2e90e8d135cef51f9753a
-      sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181
+      md5: 5e23d20fc6e33061c063220146579990
+      sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1
     category: main
     optional: false
   - name: ipython
@@ -8562,11 +8562,11 @@ package:
       traitlets: ">=5"
       jedi: ">=0.16"
       pexpect: ">4.3"
-      prompt-toolkit: ">=3.0.30,<3.1.0,!=3.0.37"
-    url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_1.conda
+      prompt-toolkit: ">=3.0.41,<3.1.0"
+    url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.conda
     hash:
-      md5: ac2f9c2e10c2e90e8d135cef51f9753a
-      sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181
+      md5: 5e23d20fc6e33061c063220146579990
+      sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1
     category: main
     optional: false
   - name: ipython
@@ -8586,11 +8586,11 @@ package:
       traitlets: ">=5"
       jedi: ">=0.16"
       pexpect: ">4.3"
-      prompt-toolkit: ">=3.0.30,<3.1.0,!=3.0.37"
-    url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_1.conda
+      prompt-toolkit: ">=3.0.41,<3.1.0"
+    url: https://conda.anaconda.org/conda-forge/noarch/ipython-8.18.1-pyh31011fe_2.conda
     hash:
-      md5: ac2f9c2e10c2e90e8d135cef51f9753a
-      sha256: 67490e640faa372d663a5c5cd2d61f417cce22a019a4de82a9e5ddb1cf2ee181
+      md5: 5e23d20fc6e33061c063220146579990
+      sha256: c956b70ed41b7f61a780a7e584f03f68e7e5073c8c138960bfbc5e705d9124b1
     category: main
     optional: false
   - name: ipywidgets
diff --git a/environments/conda-osx-64.lock.yml b/environments/conda-osx-64.lock.yml
index da2a4d0732..65902e119d 100644
--- a/environments/conda-osx-64.lock.yml
+++ b/environments/conda-osx-64.lock.yml
@@ -446,7 +446,7 @@ dependencies:
   - h3-py=3.7.6=py311hdf8f085_1
   - httpx=0.25.2=pyhd8ed1ab_0
   - identify=2.5.32=pyhd8ed1ab_0
-  - ipython=8.18.1=pyh31011fe_1
+  - ipython=8.18.1=pyh31011fe_2
   - isoduration=20.11.0=pyhd8ed1ab_0
   - jsonschema=4.20.0=pyhd8ed1ab_0
   - jupyter_client=8.6.0=pyhd8ed1ab_0
diff --git a/environments/conda-osx-arm64.lock.yml b/environments/conda-osx-arm64.lock.yml
index 631841e00f..cf56819358 100644
--- a/environments/conda-osx-arm64.lock.yml
+++ b/environments/conda-osx-arm64.lock.yml
@@ -446,7 +446,7 @@ dependencies:
   - h3-py=3.7.6=py311ha891d26_1
   - httpx=0.25.2=pyhd8ed1ab_0
   - identify=2.5.32=pyhd8ed1ab_0
-  - ipython=8.18.1=pyh31011fe_1
+  - ipython=8.18.1=pyh31011fe_2
   - isoduration=20.11.0=pyhd8ed1ab_0
   - jsonschema=4.20.0=pyhd8ed1ab_0
   - jupyter_client=8.6.0=pyhd8ed1ab_0