made changes on release branch for testing merge conflict
changed error message
Merge branch 'master' into develop

Conflicts:
	test/a.txt