vagrant auto completion
fixed merge error