updated negative line.
merge remote-tracking branch 'origin/branch2' into branch2

Conflicts:
	test 3rd file.txt