Resolving Vagrantfile conflict