xxx dfddfdsfds
modified master
add new line
Merge branch 'RD_1.0'

Conflicts:
	test.txt