merge vagrant
merge vagrant