diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index a9396409..22f7d512 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -17,9 +17,6 @@ jobs:
 
   tests:
     runs-on: ${{ matrix.os }}
-<<<<<<< Updated upstream
-    timeout-minutes: 15 # Consider increasing timeout
-=======
     timeout-minutes: 15
 
     strategy: