diff --git a/33222tt b/33222tt
index 5e37f5f..d21bde8 100644
--- a/33222tt
+++ b/33222tt
@@ -2,4 +2,8 @@
 <<<<<<< HEAD
 "lalalalal"  
 test add new
+<<<<<<< HEAD
 "dsfalfkj"  
+=======
+zhetaikepal
+>>>>>>> cf60237e0fe000cf325ef321e10e2aae34ebce07