test branch
 create hello.txt
Merge branch 'testing' into testing22
remove test.txt ;  update hello.txt
update hello.txt
remove test.txt ;  update hello.txt
Merge branch 'testing2'

Conflicts:
	hello.txt
Merge branch 'testing3'

Conflicts:
	hello.txt