Added line 1a
Added line 1b
Added line 2a
Merge branch 'branch1'

Conflicts:
	file.txt