Added line 3
Added line 2
Merge branch 'testing'
Added line 4
Merge branch 'testing'
Added line 5
Merge branch 'testing'
Added line 6a
Added line 6b
Merge branch 'mybranch'

Conflicts:
	file.txt
Merge remote-tracking branch 'origin/master'