merge changes from vbox