small changes
vagrantfile conflicts