add line 3 on text1.md
add line#5
solve the confict
3 lines
Merge branch 'feature1'
modify line4, add line7 and line8
line7 and line8 by master
a
b