Modified project settings
diff --git a/project.config b/project.config
index 6c36b3c..77a30fc 100644
--- a/project.config
+++ b/project.config
@@ -1,7 +1,7 @@
 [access]
 	inheritFrom = All-Projects
 [submit]
-	action = rebase if necessary
+	action = merge always
 [receive]
 	requireSignedOffBy = true
 [project]