fix(s3): fix rebase error (#3905)

* fix(s3): fix rebase error

* fix(s3): fix build error

serverless/jobs/quickstart.mdx

@@ -64,7 +64,7 @@ This page explains how to create a job definition with the latest Alpine Linux i
 
   The execution appears in the **Job runs** section of the **Overview** tab.
 
-4. Click the <Icon name="more"> icon next to the last execution in the **Job runs** section, then click **Logs** to access your job's logs.
+4. Click the <Icon name="more" /> icon next to the last execution in the **Job runs** section, then click **Logs** to access your job's logs.
 
 <Message type="note">
   Make sure that you [have retrieved your Grafana credentials](/observability/cockpit/how-to/retrieve-grafana-credentials/) before accessing your job's logs.

storage/object/concepts.mdx

@@ -15,11 +15,7 @@ categories:
 
 ## Access control list (ACL)
 
-<<<<<<< HEAD
-Access control lists (ACL) are subresources attached to buckets and objects. They define which Scaleway users have access to the attached object/bucket, and the type of access they have. Whenever a user makes a request against a resource, Amazon S3 checks its ACL and verifies that they have permission to carry out the request.
-=======
-Access control lists (ACL) are subresources attached to buckets and objects. They define which Scaleway users have access to the attached object/bucket, and the type of access they have. Whenever a user makes a request against a resource, Object Storage checks its ACL and verifies that they have permission to carry out the request.
->>>>>>> 8888c6b0f (feat(gen): remove mentions of S3 only)
+control lists (ACL) are subresources attached to buckets and objects. They define which Scaleway users have access to the attached object/bucket, and the type of access they have. Whenever a user makes a request against a resource, Amazon S3 checks its ACL and verifies that they have permission to carry out the request.
 
 ## Bucket