git conflict
Merge branch 'master' of github.com:elvalad/gittest

Conflicts:
	README.md