diff --git a/.gitignore b/.gitignore
index 9f3eedb..3d266c8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,10 @@
 ### Example user template
 
 # IntelliJ project files
-.idea
+.idea/
 *.iml
 out
 gen
 
+__pycache__/
+
diff --git a/README.md b/README.md
index 21606dd..02b1667 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,6 @@
 # TSP_v1
 
+<<<<<<< HEAD
 # 说明
 
 
@@ -36,3 +37,5 @@ python main.py
 
     
 
+=======
+>>>>>>> origin/main
diff --git a/__pycache__/get_real_data.cpython-310.pyc b/__pycache__/get_real_data.cpython-310.pyc
new file mode 100644
index 0000000..b0b9ae4
Binary files /dev/null and b/__pycache__/get_real_data.cpython-310.pyc differ
diff --git a/__pycache__/tsp_canvas.cpython-310.pyc b/__pycache__/tsp_canvas.cpython-310.pyc
new file mode 100644
index 0000000..f34c87c
Binary files /dev/null and b/__pycache__/tsp_canvas.cpython-310.pyc differ
diff --git a/__pycache__/tsp_data.cpython-310.pyc b/__pycache__/tsp_data.cpython-310.pyc
new file mode 100644
index 0000000..02355a5
Binary files /dev/null and b/__pycache__/tsp_data.cpython-310.pyc differ
diff --git a/__pycache__/tsp_ui.cpython-310.pyc b/__pycache__/tsp_ui.cpython-310.pyc
new file mode 100644
index 0000000..b440253
Binary files /dev/null and b/__pycache__/tsp_ui.cpython-310.pyc differ