testing with vagrantd.bat
fixed merge