hi
branch1
branch2
Merge branch 'branch2'

Conflicts:
	hello.c