update packages
fix conflict