initial with vagrant
Merging...