Resolved conflicts

Author: swatimodi-scout

daprdocs/content/en/reference/components-reference/supported-bindings/kinesis.md

@@ -57,11 +57,7 @@ The above example uses secrets as plain strings. It is recommended to use a secr
 | `secretKey`          | Y        | Output | The AWS Secret Access Key to access this resource                       | `"secretAccessKey"` |
 | `sessionToken`       | N        | Output | The AWS session token to use                                            | `"sessionToken"`    |
 | `direction`       | N        | Input/Output | The direction of the binding                                            | `"input"`, `"output"`, `"input, output"`    |
-<<<<<<< HEAD
-| `endpoint`        | N        | Input | Custom endpoint for Kinesis and DynamoDB (e.g., for LocalStack support) | `"http://localhost:4566"` |
-=======
 | `endpoint`        | N           | Input | Custom endpoint for Kinesis and DynamoDB (e.g., for LocalStack support) | `"http://localhost:4566"` |
->>>>>>> 8d66ac72 (docs(bindings/aws.kinesis): document new  metadata for custom endpoint support e.g. LocalStack (see components-contrib#3931))
 
 
 {{% alert title="Important" color="warning" %}}