One more try
Merge branch 'master' of github.com:laurentiubold/gitcommtest

Conflicts:
	someFile.txt
Merge branch 'master' of github.com:laurentiubold/gitcommtest
OK