Update Vagrantfile
Fix conflict