diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index daca923b..d388a7ee 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -66,7 +66,11 @@ jobs:
           - python: '3.12'
             os: ubuntu-latest
             setuptools: setuptools==69.*
+<<<<<<< HEAD
             numpy: numpy==1.24.*
+=======
+            numpy: numpy==1.25.*
+>>>>>>> 17efdd6db499e774826839fedad48417056a058c
             pins: ""
             display_name: "latest"
             extras: "[test,gridadmin]"