# Conflicts: # daima.txt
@@ -3,4 +3,6 @@ vbsjdkbvjk sb jk1
=======
jhhf jkhh kng
->>>>>>> .theirsgs
+>>>>>>> .theirshbmn
+dghf sdjk kVNKvnskdn
+ gjksdjkm
