Manage the usage of the VM
Fix the conflit merge