second?
master
someconflicts
Merge branch 'someconflicts'

Conflicts:
	newf