add a
add b
Merge branch 'newbranch'
1
test
ok
Merge branch 'other'

Conflicts:
	a