just test
Please enter the commit message for your changes. Lines starting
conflect
Merge branch 'test'

Conflicts:
	hello.sh