diff --git a/pzc.txt b/pzc.txt
index 1d528ec..248caf1 100644
--- a/pzc.txt
+++ b/pzc.txt
@@ -1,4 +1,8 @@
 pzchs
+<<<<<<< HEAD
 666
 520
-zkn
\ No newline at end of file
+zkn
+=======
+1111
+>>>>>>> 5ae0952469caf3a42103a5c3befee868aa623fd0