add friendly id
fix conflict