edit confict.txt on branch xiongyan
update conflict.txt
Merge branch 'xiongyan'

Conflicts:
	conflict.txt