fix translation
fix conflict