fix the vagrant file

strip out the stuff that the git merge put in.