branch commit
branch 2nd
Merge branch 'newbranch'

Conflicts:
	public/robots.txt