diff --git a/.github/runs-on.yml b/.github/runs-on.yml
index 1911c527481d..e21895ee8c3b 100644
--- a/.github/runs-on.yml
+++ b/.github/runs-on.yml
@@ -34,7 +34,3 @@ runners:
     cpu: 32
     family: ["c7i-flex", "c7i", "c7a", "c5", "c5a"]
     image: windows-amd64
-<<<<<<< HEAD
-=======
-
->>>>>>> upstream/master