add test sentence
test file
add new readme.md @ test branch
add hotfix
add record.txt
Merge branch 'hotfix'
modify hotfix.txt
modify record.txt
Merge branch 'fixbug'
modify readme.md
readme.md is modify
fix conflict