add edit hint
fix conflict