add second sentence
fix typo
add third sentence
Merge branch 'fix_typo'
fix conflict