New packages
Resolve conflicts
Remove Vagrant