remove the changes
Merge branch 'release/R4'

Conflicts:
	manage.txt
hot fix change
Merge branch 'hotfix/r4_hotfix' into develop