Fix typo
add issue tips
fix conflict