Add vagrant file
Resolve git conflict