From c5bcb6e69daea056e39b56309ea196a7e4041a4d Mon Sep 17 00:00:00 2001
From: Joshua Colvin <jcolvin@offchainlabs.com>
Date: Wed, 27 Sep 2023 14:17:27 -0700
Subject: [PATCH 1/3] Add `merge_group` to workflows to prepare for merge
 queues

---
 .github/workflows/arbitrator-ci.yml      | 1 +
 .github/workflows/arbitrator-skip-ci.yml | 1 +
 .github/workflows/ci.yml                 | 1 +
 .github/workflows/codeql-analysis.yml    | 2 ++
 .github/workflows/docker.yml             | 1 +
 5 files changed, 6 insertions(+)

diff --git a/.github/workflows/arbitrator-ci.yml b/.github/workflows/arbitrator-ci.yml
index ae25171859..f2b141fb46 100644
--- a/.github/workflows/arbitrator-ci.yml
+++ b/.github/workflows/arbitrator-ci.yml
@@ -3,6 +3,7 @@ run-name: Arbitrator CI triggered from @${{ github.actor }} of ${{ github.head_r
 
 on:
   workflow_dispatch:
+  merge_group:
   pull_request:
     paths:
       - 'arbitrator/**'
diff --git a/.github/workflows/arbitrator-skip-ci.yml b/.github/workflows/arbitrator-skip-ci.yml
index 6dfd962ee6..75fb47d0a5 100644
--- a/.github/workflows/arbitrator-skip-ci.yml
+++ b/.github/workflows/arbitrator-skip-ci.yml
@@ -2,6 +2,7 @@ name: Arbitrator skip CI
 run-name: Arbitrator skip CI triggered from @${{ github.actor }} of ${{ github.head_ref }}
 
 on:
+  merge_group:
   pull_request:
     paths-ignore:
       - 'arbitrator/**'
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a0f5251f9f..0734aecfd0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,6 +3,7 @@ run-name: Go tests CI triggered from @${{ github.actor }} of ${{ github.head_ref
 
 on:
   workflow_dispatch:
+  merge_group:
   pull_request:
   push:
     branches:
diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml
index e4aacdcd65..cfb5b6eda6 100644
--- a/.github/workflows/codeql-analysis.yml
+++ b/.github/workflows/codeql-analysis.yml
@@ -14,6 +14,8 @@ name: "CodeQL"
 on:
   push:
     branches: [ "master" ]
+  merge_group:
+    branches: [ "master" ]
   pull_request:
     # The branches below must be a subset of the branches above
     branches: [ "master" ]
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index d391dd4096..6192f65a4e 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -3,6 +3,7 @@ run-name: Docker build CI triggered from @${{ github.actor }} of ${{ github.head
 
 on:
   workflow_dispatch:
+  merge_group:
   pull_request:
   push:
     branches:

From be91de71991c59d1e2d778ccdb7cda996266185d Mon Sep 17 00:00:00 2001
From: Lee Bousfield <ljbousfield@gmail.com>
Date: Wed, 27 Sep 2023 17:42:13 -0600
Subject: [PATCH 2/3] Only warn if we hit an issue polling for batch reverts

---
 arbnode/batch_poster.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/arbnode/batch_poster.go b/arbnode/batch_poster.go
index 4f50831e67..57147eb94a 100644
--- a/arbnode/batch_poster.go
+++ b/arbnode/batch_poster.go
@@ -331,7 +331,7 @@ func (b *BatchPoster) pollForReverts(ctx context.Context) {
 
 			reverted, err := b.checkReverts(ctx, blockNum)
 			if err != nil {
-				logLevel := log.Error
+				logLevel := log.Warn
 				if strings.Contains(err.Error(), "not found") {
 					// Just parent chain node inconsistency
 					// One node sent us a block, but another didn't have it

From 7bf3e0550c8ed7cfa1274b476c4ddfadaea90e84 Mon Sep 17 00:00:00 2001
From: Fionna Chan <fionnachan@users.noreply.github.com>
Date: Thu, 28 Sep 2023 08:20:11 +0800
Subject: [PATCH 3/3] Update logo on README

---
 README.md | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index 2cfef3de6a..67a182ec30 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <br />
 <p align="center">
   <a href="https://arbitrum.io/">
-    <img src="https://arbitrum.io/wp-content/uploads/2021/08/Arbitrum_Symbol-Full-color-White-background-768x840.png" alt="Logo" width="80" height="80">
+    <img src="https://arbitrum.io/assets/arbitrum/logo_color.png" alt="Logo" width="80" height="80">
   </a>
 
   <h3 align="center">Arbitrum Nitro</h3>
@@ -14,7 +14,7 @@
 
 ## About Arbitrum Nitro
 
-<img src="https://arbitrum.io/wp-content/uploads/2021/08/Arbitrum_Symbol-Full-color-White-background-768x840.png" alt="Logo" width="80" height="80">
+<img src="https://arbitrum.io/assets/arbitrum/logo_color.png" alt="Logo" width="80" height="80">
 
 Nitro is the latest iteration of the Arbitrum technology. It is a fully integrated, complete
 layer 2 optimistic rollup system, including fraud proofs, the sequencer, the token bridges,