diff --git a/.github/workflows/test_server_root_path.yml b/.github/workflows/test_server_root_path.yml
index fa57491db3..ad6605a029 100644
--- a/.github/workflows/test_server_root_path.yml
+++ b/.github/workflows/test_server_root_path.yml
@@ -3,8 +3,17 @@ permissions:
   contents: read
 
 on:
+<<<<<<< HEAD
   pull_request:
     branches: [main]
+=======
+  push:
+      - main
+  pull_request:
+    branches:
+      - main
+  workflow_dispatch:
+>>>>>>> 8ab2c91722a1a951664873fae467f761f9c4dbb9
 
 jobs:
   test-server-root-path: