made changes on develop branch for testing merge conflict
Merge branch 'master' into develop

Conflicts:
	test/a.txt
	test/c.txt
added general error message if something goes wrong
made changes on release branch for testing merge conflict