冲突
a
aaa
Merge branch 'master' of https://github.com/jhaoniu/mt_data
conflit
terge branch 'master' of https://github.com/jhaoniu/mt_data

Conflicts:
	read.txt
test