I expect a conflict
Merge branch 'master' of github.com:jamespjh/jh-answers-autumn

Conflicts:
	newname