diff --git a/client/docs/swagger-ui/swagger.yaml b/client/docs/swagger-ui/swagger.yaml
index 0ccb8ebf5d..bb66382199 100644
--- a/client/docs/swagger-ui/swagger.yaml
+++ b/client/docs/swagger-ui/swagger.yaml
@@ -54267,49 +54267,6 @@ definitions:
 
           and can't be handled, they will be ignored
     description: TxBody is the body of a transaction that all signers sign over.
-<<<<<<< HEAD
-=======
-  tendermint.abci.Event:
-    type: object
-    properties:
-      type:
-        type: string
-      attributes:
-        type: array
-        items:
-          type: object
-          properties:
-            key:
-              type: string
-              format: byte
-            value:
-              type: string
-              format: byte
-            index:
-              type: boolean
-              format: boolean
-          description: 'EventAttribute is a single key-value pair, associated with an event.'
-    description: >-
-      Event allows application developers to attach additional information to
-
-      ResponseBeginBlock, ResponseEndBlock, ResponseCheckTx and
-      ResponseDeliverTx.
-
-      Later, transactions may be queried using these events.
-  tendermint.abci.EventAttribute:
-    type: object
-    properties:
-      key:
-        type: string
-        format: byte
-      value:
-        type: string
-        format: byte
-      index:
-        type: boolean
-        format: boolean
-    description: 'EventAttribute is a single key-value pair, associated with an event.'
->>>>>>> 59f7256ca (chore: refactor to use snake_case in proto (#1396))
   cosmos.upgrade.v1beta1.ModuleVersion:
     type: object
     properties: