add master 1
merge?
rollback
merge
Merge branch 'master' of https://github.com/dvaughn555/testgit

Conflicts:
	two.txt.txt
push two.txt
initial
blah
Merge branch 'master' of https://github.com/dvaughn555/testgit

Conflicts:
	two.txt.txt