0
1
merge fixed
t
t
git
conflict
merge fixed again
conflict
conflicttt
Merge branch 'testing'

Conflicts:
	git_cheatsheet.txt