diff --git a/my3.txt b/my3.txt
index 1ff68f2..64abd33 100644
--- a/my3.txt
+++ b/my3.txt
@@ -2,4 +2,11 @@
 564
 45645
 6546
-4564 vhjmkvghkm
\ No newline at end of file
+<<<<<<< HEAD
+4564 vhjmkvghkm
+=======
+4564 vhjmkvghkm
+56546745674
+
+656564
+>>>>>>> fa4d567 (33 added 33 --338883)