Update packages
Merge changes