Fix merged files

Author: waldemarnt

.github/workflows/full-workflow.yml

@@ -21,23 +21,18 @@ jobs:
 
     strategy:
       matrix:
-<<<<<<< HEAD
-        node-version: [14.x]
+        node-version: [16.x]
 
     services:
       mongodb:
-        image: mongo:4.2
+        image: mongo:5.0
         ports:
           - 27017
         options: >-
           --health-cmd mongo
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
-=======
-        node-version: [16.x]
-        mongodb-version: [5.0]
->>>>>>> chapter9/step3
 
     steps:
       - uses: actions/checkout@v2

src/clients/__test__/stormGlass.test.ts

@@ -108,11 +108,6 @@ describe('StormGlass client', () => {
 
     MockedRequestClass.isRequestError.mockReturnValue(true);
 
-//<<<<<<< HEAD
-    //MockedCacheUtil.get.mockReturnValue(undefined);
-
-    //const stormGlass = new StormGlass(mockedRequest, MockedCacheUtil);
-//=======
     MockedRequestClass.extractErrorData.mockReturnValue({
       status: 429,
       data: { errors: ['Rate Limit reached'] },