@@ -1,8 +1,11 @@
-<<<<<<< .mine
+
vbsjdkbvjk sb jk1
=======
jhhf jkhh kng
->>>>>>> .theirshbmn
+=======
+.theirshbmn
dghf sdjk kVNKvnskdn
- gjksdjkm
+ gjksdjkm
