chore: fix merge conflict

Author: ycexiao

news/molecule.rst

@@ -0,0 +1,24 @@
+**Added:**
+
+* support load PDF model from pyobjcryst code.
+* support molecule PDF refinement.
+
+**Changed:**
+
+* <news item>
+
+**Deprecated:**
+
+* <news item>
+
+**Removed:**
+
+* <news item>
+
+**Fixed:**
+
+* <news item>
+
+**Security:**
+
+* <news item>

tests/helper.py

@@ -261,7 +261,7 @@ def run_nanoparticle_example():
 
 
 def run_c60_example():
-    global_namespace = {"c60xyz_path": str(_DATA_DIR / "C60xyz.txt")}
+    global_namespace = {"c60xyz_path": str(_DATA_DIR / "c60xyz.txt")}
     local_namespace = {}
     exec(
         (Path(__file__).parent / "data" / "make_c60.txt").read_text(),

tests/test_refinement_session.py

@@ -412,7 +412,7 @@ def test_refine_c60_example():
         model_name="pdf",
         code=make_c60_py,
         local_structure_name="molecule",  # The structure name in 'code'
-        global_namespace={"c60xyz_path": str(_DATA_DIR / "C60xyz.txt")},
+        global_namespace={"c60xyz_path": str(_DATA_DIR / "c60xyz.txt")},
         finite=True,
     )
     for i in range(1, 61):