fix merge conflict

Author: P Coolen

packages/serverless-component/serverless.js

@@ -172,13 +172,9 @@ class NextjsComponent extends Component {
 
     if (hasAPIPages) {
       const apiEdgeLambdaInput = {
-<<<<<<< Updated upstream
-        description: `${inputs.description} (API)` || "API Lambda@Edge for Next CloudFront distribution",
-=======
         description:
           `${inputs.description} (API)` ||
           "API Lambda@Edge for Next CloudFront distribution",
->>>>>>> Stashed changes
         handler: "index.handler",
         code: join(nextConfigPath, API_LAMBDA_CODE_DIR),
         role: {
@@ -220,13 +216,9 @@ class NextjsComponent extends Component {
     }
 
     const defaultEdgeLambdaInput = {
-<<<<<<< Updated upstream
-      description: inputs.description || "Default Lambda@Edge for Next CloudFront distribution",
-=======
       description:
         inputs.description ||
         "Default Lambda@Edge for Next CloudFront distribution",
->>>>>>> Stashed changes
       handler: "index.handler",
       code: join(nextConfigPath, DEFAULT_LAMBDA_CODE_DIR),
       role: {