fixed vagrant-re
merge problem again