add text
fix conflict