diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 0d7f74fa..ee4ad053 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -32,7 +32,7 @@ jobs:
     - name: Install Composer dependencies
       env:
         PHP_VERSION: ${{ matrix.php-versions }}
-      run: $(if [ "$PHP_VERSION" == "7.0" ]; then echo "composer config --no-plugins allow-plugins.kylekatarnls/update-helper &&"; fi;) composer install --no-progress --prefer-dist --optimize-autoloader
+      run: $(if [ "$PHP_VERSION" == "7.0" ]; then echo "composer config --no-plugins allow-plugins.kylekatarnls/update-helper | composer install"; else echo "composer install --no-progress --prefer-dist --optimize-autoloader"; fi;)
     - name: Run tests with code coverage
       env:
         PHP_VERSION: ${{ matrix.php-versions }}
diff --git a/src/Traits/PayPalAPI/Orders.php b/src/Traits/PayPalAPI/Orders.php
index d73852bf..afcff5ec 100644
--- a/src/Traits/PayPalAPI/Orders.php
+++ b/src/Traits/PayPalAPI/Orders.php
@@ -93,7 +93,6 @@ public function confirmOrder(string $order_id, array $data)
     }
 
     /**
->>>>>>> v3.0
      * Authorizes payment for an order.
      *
      * @param string $order_id