diff --git a/groups b/groups
index daf4c67..8be631f 100644
--- a/groups
+++ b/groups
@@ -3,7 +3,7 @@
 global:Anonymous-Users 	Anonymous Users
 global:Project-Owners  	Project Owners
 global:Registered-Users	Registered Users
-mdb:hafnium-admin      	mdb/hafnium-admin
 mdb:hafnium-access     	mdb/hafnium-access
+mdb:hafnium-admin      	mdb/hafnium-admin
 mdb:kokoro             	mdb/kokoro
 mdb:kokoro-dedicated   	mdb/kokoro-dedicated
diff --git a/project.config b/project.config
index de8bb50..02aa326 100644
--- a/project.config
+++ b/project.config
@@ -6,13 +6,14 @@
 	requireChangeId = true
 	enableSignedPush = false
 [submit]
-	mergeContent = true
+	mergeContent = false
+	action = rebase if necessary
 [capability]
 	administrateServer = group mdb/hafnium-admin
 [access "refs/*"]
 	read = group Anonymous Users
-	read = group mdb/hafnium-admin
 	read = group mdb/hafnium-access
+	read = group mdb/hafnium-admin
 	read = group mdb/kokoro
 	read = group mdb/kokoro-dedicated
 [access "refs/for/*"]