diff --git a/cat.py b/cat.py
new file mode 100644
index 0000000000000000000000000000000000000000..9c307bdedbaebbb418f7650ec0b4d56d59142811
--- /dev/null
+++ b/cat.py
@@ -0,0 +1,3 @@
+class cat():
+    def __init(self):
+        def colore
diff --git a/code.py b/code.py
new file mode 100644
index 0000000000000000000000000000000000000000..5f30804dfe26135063ccaf1d37e7ce92630ade9b
--- /dev/null
+++ b/code.py
@@ -0,0 +1 @@
+class miu）
diff --git a/niubi.py b/niubi.py
index d7f3be3a55a8071e6816062d4f5d5d02f812e72f..033c212f79feb74bde3d1642b90c74c25d220b53 100644
--- a/niubi.py
+++ b/niubi.py
@@ -1,5 +1,12 @@
 class haozhiweizhi():
     def __init__(self):
+<<<<<<< HEAD
+        wude
+        mush
+        a反对发射点发生、
+        发射点发射点发a、
+        发生发射
         wudepush
         denuy
-        fasfasf
\ No newline at end of file
+        fasfasf
+>>>>>>> bcf899bc7b99bd7476f0169d05f12b96815a4214