diff --git a/.github/ISSUE_TEMPLATE/config.yml b/.github/ISSUE_TEMPLATE/config.yml
index 38656f24d32..4a498ff075f 100644
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,4 +1,5 @@
 blank_issues_enabled: false
+<<<<<<< HEAD
 
 contact_links:
   - name: Feature Requests
@@ -7,3 +8,12 @@ contact_links:
   - name: Questions
     url: https://github.com/nyaruka/rapidpro/discussions/categories/q-a
     about: Ask general questions about RapidPro
+=======
+contact_links:
+  - name: Getting Help
+    url: https://groups.google.com/g/rapidpro-dev
+    about: If you have a question about your own installation, ask a question on the dev list.
+  - name: Bugs and feature requests
+    url: https://github.com/nyaruka/rapidpro/issues
+    about: Open an issue with the maintainers to file a bug you found or to collaborate on new features.
+>>>>>>> agpl/main
diff --git a/.github/workflows/stale.yml b/.github/workflows/stale.yml
index 19b2e0e4092..941d89d5cb5 100644
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -1,4 +1,5 @@
 # This workflow warns and then closes issues and PRs that have had no activity for a specified amount of time.
+<<<<<<< HEAD
 # For more information, see: https://github.com/actions/stale
 name: Close stale issues and PRs
 on:
@@ -6,10 +7,26 @@ on:
     - cron: "30 1 * * *"
 jobs:
   stale:
+=======
+#
+# You can adjust the behavior by modifying this file.
+# For more information, see:
+# https://github.com/actions/stale
+name: Close inactive issues and PRs
+
+on:
+  schedule:
+  - cron: '30 1 * * *'
+
+jobs:
+  stale:
+
+>>>>>>> agpl/main
     runs-on: ubuntu-latest
     permissions:
       issues: write
       pull-requests: write
+<<<<<<< HEAD
     steps:
       - uses: actions/stale@v5
         with:
@@ -25,3 +42,20 @@ jobs:
           days-before-issue-stale: 30
           days-before-issue-close: 14
           exempt-all-assignees: true
+=======
+
+    steps:
+    - uses: actions/stale@v5
+      with:
+        repo-token: ${{ secrets.GITHUB_TOKEN }}
+        stale-issue-label: 'inactive'
+        stale-issue-message: 'Without activity, this issue will be closed in 14 days.'
+        close-issue-message: 'This issue was closed for inactivity.'
+        stale-pr-message: 'Without activity, this PR will be closed in 14 days.'
+        close-pr-message: 'This PR was closed for inactivity.'
+        stale-pr-label: 'inactive'
+        days-before-pr-stale: 30
+        days-before-pr-close: 14
+        days-before-issue-stale: 30
+        days-before-issue-close: 14
+>>>>>>> agpl/main
diff --git a/LICENSE b/LICENSE
index 0a7f0189501..94d51733edb 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,12 @@
+<<<<<<< HEAD
 Business Source License 1.1
 
 Parameters
+=======
+RapidPro - platform to visually build interactive messaging systems.
+
+Copyright (C) 2012-2023 Nyaruka, Inc., UNICEF.
+>>>>>>> agpl/main
 
 Licensor:             Nyaruka, Inc.
 Licensed Work:        TextIt
diff --git a/README.md b/README.md
index da83552da26..da781440747 100644
--- a/README.md
+++ b/README.md
@@ -3,13 +3,19 @@
 [![Build Status](https://github.com/nyaruka/rapidpro/workflows/CI/badge.svg)](https://github.com/nyaruka/rapidpro/actions?query=workflow%3ACI) 
 [![codecov](https://codecov.io/gh/nyaruka/rapidpro/branch/main/graph/badge.svg)](https://codecov.io/gh/nyaruka/rapidpro)
 
+<<<<<<< HEAD
 TextIt is a hosted service for visually building interactive messaging applications. You can signup at 
 [textit.com](https://textit.com) or host it yourself.
+=======
+RapidPro is a platform for visually building interactive messaging applications.
+To learn more, please visit the project site at http://rapidpro.github.io/rapidpro.
+>>>>>>> agpl/main
 
 ### Stable Versions
 
 The set of versions that make up the latest stable release are:
 
+<<<<<<< HEAD
  * [RapidPro 9.0.0](https://github.com/rapidpro/rapidpro/releases/tag/v9.0.0)
  * [Mailroom 9.0.1](https://github.com/rapidpro/mailroom/releases/tag/v9.0.1)
  * [Courier 9.0.1](https://github.com/nyaruka/courier/releases/tag/v9.0.1)
@@ -29,3 +35,30 @@ for the latest stable release you are on, then every stable release afterwards.
 Generally we only do bug fixes (patch releases) on stable releases for the first two weeks after we put
 out that release. After that you either have to wait for the next stable release or take your chances with an unstable 
 release.
+=======
+ * [RapidPro v7.4.2](https://github.com/rapidpro/rapidpro/releases/tag/v7.4.2)
+ * [Mailroom v7.4.1](https://github.com/rapidpro/mailroom/releases/tag/v7.4.1)
+ * [Courier v7.4.0](https://github.com/nyaruka/courier/releases/tag/v7.4.0)
+ * [Archiver v7.4.0](https://github.com/nyaruka/rp-archiver/releases/tag/v7.4.0)
+ * [Indexer v7.4.0](https://github.com/nyaruka/rp-indexer/releases/tag/v7.4.0)
+ * [Android Channel v2.0.0](https://github.com/rapidpro/android-channel/releases/tag/v2.0.0)
+ * [Android Surveyor v13.9.0](https://github.com/rapidpro/surveyor/releases/tag/v13.9.0)
+
+### Versioning
+
+Major releases are made every four months on a set schedule. We target November 1st
+as a major release (`v7.0.0`), then March 1st as the first stable dot release (`v7.2.0`) and July 1st
+as the second stable dot release (`v7.4.0`). The next November would start the next major release `v8.0.0`.
+
+Unstable releases have odd minor versions, that is versions `v7.1.*` would indicate an unstable or *development*
+version. Generally we recommend staying on stable releases.
+
+To upgrade from one stable release to the next, you should first install and run the migrations
+for the latest stable release you are on, then every stable release afterwards. If you are
+on version `v6.0.12` and the latest stable release on the `v6.0` series is `v6.0.14`, you should
+first install `v6.0.14` before trying to install the next stable release `v6.2.5`.
+
+Generally we only do bug fixes (patch releases) on stable releases for the first two weeks after we put
+out that release. After that you either have to wait for the next stable release or take your
+chances with an unstable release.
+>>>>>>> agpl/main