rm History.txt
edit
asdfasdfasdf
rm Hi
aswh
Merge branch 'testing3'

Conflicts:
	History.txt