change vagrant
update vagrant and fix conflict