merge instad of rebase??

.drone.yml

@@ -14,7 +14,7 @@ steps:
       - npm run build
       - apt-get update && apt-get install -y rsync
       - git config credential.helper '!f() { echo username=inherentlee; echo "password=$GIT_TOKEN"; };f'
-      - git submodule update --remote --init --recursive --rebase
+      - git submodule update --remote --init --recursive --merge
       - rsync -uavh _site/ $REPOSITORY --delete --exclude .git
       - cd $REPOSITORY
       - git status

.gitmodules

@@ -1,4 +1,4 @@
 [submodule "mattrbld-site"]
 	path = mattrbld-site
 	url = https://heckin.technology/inherentlee/mattrbld-site.git
-	update = rebase
+	update = merge