add line 3
merge
Merge branch 'newb'

Conflicts:
	hello