diff --git a/.gitea/workflows/update-flake.yaml b/.gitea/workflows/update-flake.yaml
index 788b3b0..0060667 100644
--- a/.gitea/workflows/update-flake.yaml
+++ b/.gitea/workflows/update-flake.yaml
@@ -34,8 +34,7 @@ jobs:
             if [ $commits_ahead -ne 0 ]
             then
               git fetch origin
-              git merge -X theirs --squash origin/main
-              git commit -m "Merge main branch squashed $(date -I)"
+              git merge -m "Merge main branch $(date -I)" -X theirs origin/main
             else
               echo "Merge not necessary"
             fi