update Detail
fix conflict