resolve merge conflict

Author: macos

.github/workflows/release.yml

@@ -8,7 +8,7 @@ jobs:
     name: release
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v1
+      - uses: actions/checkout@v4
       - uses: actions/setup-node@v4
       - run: 'echo ''{
           "name": "ccapi_cpp",

.github/workflows/test.yml

@@ -53,7 +53,7 @@ jobs:
       #   }
 
     steps:
-    - uses: actions/checkout@v1
+    - uses: actions/checkout@v4
 
     - name: Download Ninja and CMake
       id: cmake_and_ninja