Update gitconfig to not use merge, update submodules