added a line
added conflicting second line
Merge branch 'mybranch' into mybranch2

Conflicts:
	test