update packages
fix merge conflicts'