[master][test.txt][sjchun19] modify
[master][test.txt] conflict
Merge branch 'RB_1.0'

Conflicts:
	test.txt