fix(s3): fix rebase error

Author: SamyOubouaziz

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