test add line
test adding another line
testing
Merge remote-tracking branch 'origin/test-branch' into branch1

Conflicts:
	file2.txt