Merge pull request #2 from lausannel/main

Restore git commit history
diff --git a/.asf.yaml b/.asf.yaml
index 90629a6..20e2eae 100644
--- a/.asf.yaml
+++ b/.asf.yaml
@@ -35,7 +35,7 @@
     # enable squash button:
     squash:  true
     # enable merge button:
-    merge:   false
+    merge:   true
     # disable rebase button:
     rebase:  true
   collaborators: