Change merge type to ours for .gitmodules so during merge this version will be kept
Change merge type to ours for .gitmodules so during merge this version will be kept

ceos-seo/data_cube_notebooks,ceos-seo/data_cube_notebooks,ceos-seo/data_cube_notebooks