conflict
Merge branch 'conflictbranch'

Conflicts:
	Hi.txt
renameproject
Merge branch 'conflictbranch'

Conflicts:
	Hi.txt