fix conflict in file1.txt

file1.txt

@@ -1 +1,2 @@
 hgvbyhnhkjmki
+hello world

test.py

@@ -0,0 +1,3 @@
+a = 2
+b = 3
+print(a + b)