resolve conflict in file1 while merging master to test1

README

@@ -0,0 +1 @@
+add README in this repo

file1.txt

@@ -1,3 +1,9 @@
 some info
 minor change
+
 added new line while in branch test1
+
+add a line in branch master
+another line
+yet another line
+