diff --git a/http/README.md b/http/README.md
index 82974075..f2becbd3 100644
--- a/http/README.md
+++ b/http/README.md
@@ -30,14 +30,8 @@ This object MUST NOT contain any properties. Its name is reserved for future use
 
 Field Name | Type | Description
 ---|:---:|---
-<<<<<<< HEAD
 <a name="operationBindingObjectMethod"></a>`method` | string | The HTTP method for the request. Its value MUST be one of `GET`, `POST`, `PUT`, `PATCH`, `DELETE`, `HEAD`, `OPTIONS`, `CONNECT`, and `TRACE`.
-<a name="operationBindingObjectQuery"></a>`query` | [Schema Object][schemaObject] | A Schema object containing the definitions for each query parameter. This schema MUST be of type object and have a properties key.
-=======
-<a name="operationBindingObjectType"></a>`type` | string | **REQUIRED**. Type of operation. Its value MUST be either `request` or `response`.
-<a name="operationBindingObjectMethod"></a>`method` | string | When `type` is `request`, this is the HTTP method, otherwise it MUST be ignored. Its value MUST be one of `GET`, `POST`, `PUT`, `PATCH`, `DELETE`, `HEAD`, `OPTIONS`, `CONNECT`, and `TRACE`.
 <a name="operationBindingObjectQuery"></a>`query` | [Schema Object][schemaObject] \| [Reference Object](referenceObject) | A Schema object containing the definitions for each query parameter. This schema MUST be of type `object` and have a `properties` key.
->>>>>>> master-github-upstream
 <a name="operationBindingObjectBindingVersion"></a>`bindingVersion` | string | The version of this binding. If omitted, "latest" MUST be assumed.
 
 This object MUST contain only the properties defined above.
@@ -101,9 +95,5 @@ channels:
             bindingVersion: '0.2.0'
 ```
 
-<<<<<<< HEAD
-[schemaObject]: https://www.asyncapi.com/docs/specifications/latest/#schemaObject
-=======
 [schemaObject]: https://github.com/asyncapi/spec/blob/master/spec/asyncapi.md#schemaObject
 [referenceObject]: https://github.com/asyncapi/spec/blob/master/spec/asyncapi.md#referenceObject
->>>>>>> master-github-upstream