commit 1234567890123457890
commit3 12345
Merge branch 'master' of https://github.com/jumroen/hello-world

Conflicts:
	helloworld.txt