diff --git a/.gitignore b/.gitignore
index 796f4b2..64d80f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,5 +5,7 @@
 *.egg-info
 dist
 build
+*.pub
+inspur
 
 
diff --git a/1232.txt b/1232.txt
new file mode 100644
index 0000000..fad6111
--- /dev/null
+++ b/1232.txt
@@ -0,0 +1,4 @@
+<<<<<<< Updated upstream
+=======
+测试的 合并成功
+>>>>>>> Stashed changes
diff --git a/head.txt b/head.txt
index e69de29..f079749 100644
--- a/head.txt
+++ b/head.txt
@@ -0,0 +1 @@
+test1
\ No newline at end of file