Added text "hi.."
Added text on 3 line
Merge remote-tracking branch 'origin/branch1'

Conflicts:
	documentTest.txt