# Conflicts: # daima.txt
@@ -3,4 +3,4 @@ vbsjdkbvjk sb jk1
=======
jhhf jkhh kng
->>>>>>> .theirshbmn
+>>>>>>> .theirshbmn
