Committing locally and pushing, creating a conflict
Merge branch 'master' of https://github.com/Maregrave/try_git.git

Conflicts:
	branch.txt
	second merge.txt