made changes on release branch for testing merge conflict
added message to be displayed if there is a merge conflict
Merge branch 'master' into develop

Conflicts:
	test/a.txt
	test/c.txt