Test2
Merge remote-tracking branch 'origin/Test1'
Merge remote-tracking branch 'origin/Test2'

Conflicts:
	hello.tpl
Merge remote-tracking branch 'origin/master' into Test1