Turn on git updating in shell
Update path
Fix merge for path conflict
Swap out bundles for submodules