upgrade vagrant config
fix annoying merge issue