update func detail
finish push list
fix conflict