fix conflict

Author: samsonasik

.github/workflows/ci_build.yml

@@ -13,11 +13,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-<<<<<<< HEAD
-        php-versions: ['7.3', '7.4', '8.0']
-=======
-        php-versions: ['8.0', '8.1']
->>>>>>> 15d7e94 (apply php 8.1 support)
+        php-versions: ['7.3', '7.4', '8.0', '8.1']
     steps:
       - name: Setup PHP Action
         uses: shivammathur/setup-php@v2