Change submodule remote path
Fixing submodule merge conflict