diff --git a/.github/workflows/dendrite.yml b/.github/workflows/dendrite.yml
index ee969ec8b..f8019b3ea 100644
--- a/.github/workflows/dendrite.yml
+++ b/.github/workflows/dendrite.yml
@@ -132,11 +132,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-<<<<<<< HEAD
         go: ["1.18", "1.19"]
-=======
-        go: ["1.18"]
->>>>>>> 698369f5 (merge latest changes from dendrite main (#15))
         goos: ["linux"]
         goarch: ["amd64", "386"]
     steps:
@@ -170,11 +166,7 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-<<<<<<< HEAD
         go: ["1.18", "1.19"]
-=======
-        go: ["1.18"]
->>>>>>> 698369f5 (merge latest changes from dendrite main (#15))
         goos: ["windows"]
         goarch: ["amd64"]
     steps:
diff --git a/setup/mscs/msc2946/msc2946.go b/setup/mscs/msc2946/msc2946.go
index a92a16a27..015ba4516 100644
--- a/setup/mscs/msc2946/msc2946.go
+++ b/setup/mscs/msc2946/msc2946.go
@@ -45,6 +45,9 @@ const (
 	ConstCreateEventContentValueSpace = "m.space"
 	ConstSpaceChildEventType          = "m.space.child"
 	ConstSpaceParentEventType         = "m.space.parent"
+	ConstJoinRulePublic               = "public"
+	ConstJoinRuleKnock                = "knock"
+	ConstJoinRuleRestricted           = "restricted"
 )
 
 type MSC2946ClientResponse struct {