Changes made in VM
Merge conflict