Vagrant file
Merge