Set up gitmodules to track vm_stable branch instead of single commit
Fixed merge conflict after changing submodules