Package updates.
Fixed merge conflicts.