diff --git a/idaes_examples/notebooks/docs/flowsheets/power_gen/ngcc/data_pfds/st_baseline.svg b/idaes_examples/notebooks/docs/flowsheets/power_gen/ngcc/data_pfds/st_baseline.svg
index 076158e0..f92b54ec 100644
--- a/idaes_examples/notebooks/docs/flowsheets/power_gen/ngcc/data_pfds/st_baseline.svg
+++ b/idaes_examples/notebooks/docs/flowsheets/power_gen/ngcc/data_pfds/st_baseline.svg
@@ -192,7 +192,7 @@
t16
-
+
diff --git a/idaes_examples/notebooks/docs/power_gen/ngcc/ngcc.ipynb b/idaes_examples/notebooks/docs/power_gen/ngcc/ngcc.ipynb
index 8c430e3a..ace26077 100644
--- a/idaes_examples/notebooks/docs/power_gen/ngcc/ngcc.ipynb
+++ b/idaes_examples/notebooks/docs/power_gen/ngcc/ngcc.ipynb
@@ -5623,5 +5623,8 @@
"nbformat_minor": 5
=======
"nbformat_minor": 3
+<<<<<<< HEAD:idaes_examples/notebooks/docs/power_gen/ngcc/ngcc.ipynb
+>>>>>>> 8818ba74788937addd589a9b2aedb1a0139f0ad7:idaes_examples/notebooks/active/power_gen/ngcc/ngcc_doc.ipynb
+=======
>>>>>>> 8818ba74788937addd589a9b2aedb1a0139f0ad7:idaes_examples/notebooks/active/power_gen/ngcc/ngcc_doc.ipynb
}