fix(ci): workflow errors

Author: barrett-ruth

.github/workflows/continuous-integration.yml

@@ -30,13 +30,6 @@ env:
   REVIEW_DRIVE_ID: ${{ secrets.REVIEW_DRIVE_ID }}
   REVIEW_DRIVE_EMAIL: ${{ secrets.REVIEW_DRIVE_EMAIL }}
   REVIEW_DRIVE_PASSWORD: ${{ secrets.REVIEW_DRIVE_PASSWORD }}
-<<<<<<< HEAD:.github/workflows/continuous-integration.yml
-=======
-  AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
-  AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
-  AWS_ACCOUNT_ID: ${{ secrets.AWS_ACCOUNT_ID }}
-  AWS_S3_BUCKET_NAME: ${{ secrets.AWS_S3_BUCKET_NAME }}
->>>>>>> parent of 6fc2531a (fix(ci): proper s3 env vars):.github/workflows/ci.yml
 
 jobs:
   pylint: