added Vagrantfile after merge conflict