step 6 merge with branch
step7 commit on branch and master should not see this line
<!-->step8 commit on master and branch should not see this line<—>
Merge branch 'dev'

Conflicts:
	hello-world/pom.xml
merge into master