Be more explicit about the forms of some of these example commands.
Causing a conflict.
Merge branch 'master' of https://github.com/abztrakt/git-practice

Conflicts:
	newfile.txt