create a conflict
Merge branch 'master' into develop

Conflicts:
	hello.rb