plan filed added
Merge branch 'test'
##hotfix: another line added
Merge branch 'test'

Conflicts:
	README.md