provoke conflict as well
Merge branch 'master' into develop

Conflicts:
	masterfile
double conflict
Merge branch 'develop'

Conflicts:
	README
	masterfile