Write text in test.txt in first branch
add second line
add third line
add four line
add five line
add six line
move text down
fix merge conflict