file2-line1
b1
ad
2
Merge branch 'b1' into develop

Conflicts:
	New Text Document.txt