Update upgrade guide.
Fix conflicts.