add new lines in file1 and guide

file1.txt

@@ -1,2 +1,3 @@
 some info
 minor change
+added new line while in branch test1

guide.txt

@@ -1 +1,2 @@
+create a conflict adding this line
 a line