update packages
merge conflicts