diff --git a/easygraph/datasets/hypergraph/cat_edge_Cooking.py b/easygraph/datasets/hypergraph/cat_edge_Cooking.py
index 6650efb0..79cde0a6 100644
--- a/easygraph/datasets/hypergraph/cat_edge_Cooking.py
+++ b/easygraph/datasets/hypergraph/cat_edge_Cooking.py
@@ -102,6 +102,3 @@ def fun(data):
         label_names_info = request_text_from_url(label_names_path)
         process_label_names_info = self.process_label_txt(label_names_info)
         self._label_names = process_label_names_info
-
-
-
diff --git a/pyproject.toml b/pyproject.toml
index 319918c4..14f1848b 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -173,28 +173,14 @@ exclude_lines = ["pragma: no cover", "if TYPE_CHECKING:"]
 # installing torch is very time consuming
 # test-requires = ["pytest", "lxml", "torch"]
 # test-command = "pytest"
-<<<<<<< HEAD
-<<<<<<< HEAD
-free-threaded-support = true
-
-# Skip building free-threaded compatible wheels on Windows
-skip = "*t-win*"
 
 build = ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
 
 
-=======
-build = ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]
-
-=======
->>>>>>> 539d2f8 (chore: test workflow)
 free-threaded-support = true
 
 # Skip building free-threaded compatible wheels on Windows
 skip = "*t-win*"
->>>>>>> 2fa1a40 (chore: test workflow)
-
-build = ["cp38-*", "cp39-*", "cp310-*", "cp311-*", "cp312-*", "cp313-*"]