Upgrade some dependencies.
Fix conflicts.