Fix merge garbage in Vagrantfile