diff --git a/.github/workflows/test-suite.yml b/.github/workflows/test-suite.yml
index 34554afaa2..8ddabb3b32 100644
--- a/.github/workflows/test-suite.yml
+++ b/.github/workflows/test-suite.yml
@@ -4,6 +4,8 @@ on:
   push:
     branches:
       - master
+      - staging
+      - trying
   pull_request:
 
 jobs:
@@ -108,27 +110,27 @@ jobs:
     - name: Lint code for quality and style with Clippy
       run: make lint
   arbitrary-check:
-   runs-on: ubuntu-latest
-   needs: cargo-fmt
-   steps:
-   - uses: actions/checkout@v1
-   - name: Validate state_processing feature arbitrary-fuzz
-     run:  make arbitrary-fuzz
+    runs-on: ubuntu-latest
+    needs: cargo-fmt
+    steps:
+    - uses: actions/checkout@v1
+    - name: Validate state_processing feature arbitrary-fuzz
+      run:  make arbitrary-fuzz
   cargo-audit:
-   runs-on: ubuntu-latest
-   needs: cargo-fmt
-   steps:
-   - uses: actions/checkout@v1
-   - name: Run cargo audit to identify known security vulnerabilities reported to the RustSec Advisory Database
-     run:  make audit
+    runs-on: ubuntu-latest
+    needs: cargo-fmt
+    steps:
+    - uses: actions/checkout@v1
+    - name: Run cargo audit to identify known security vulnerabilities reported to the RustSec Advisory Database
+      run:  make audit
   cargo-udeps:
-   runs-on: ubuntu-latest
-   needs: cargo-fmt
-   steps:
-   - uses: actions/checkout@v1
-   - name: Get latest version of nightly Rust
-     run: rustup update nightly
-   - name: Install cargo-udeps
-     run: cargo install cargo-udeps --locked
-   - name: Run cargo udeps to identify unused crates in the dependency graph
-     run: make udeps
+    runs-on: ubuntu-latest
+    needs: cargo-fmt
+    steps:
+    - uses: actions/checkout@v1
+    - name: Get latest version of nightly Rust
+      run: rustup update nightly
+    - name: Install cargo-udeps
+      run: cargo install cargo-udeps --locked
+    - name: Run cargo udeps to identify unused crates in the dependency graph
+      run: make udeps
diff --git a/bors.toml b/bors.toml
new file mode 100644
index 0000000000..4626b90696
--- /dev/null
+++ b/bors.toml
@@ -0,0 +1,3 @@
+status = ["%"]
+use_squash_merge = true
+timeout_sec = 7200