diff --git a/rpc/interface/README.md b/rpc/interface/README.md
index 59d9f04..e8be2d0 100644
--- a/rpc/interface/README.md
+++ b/rpc/interface/README.md
@@ -85,13 +85,7 @@ use cuprate_rpc_types::{
     json::{JsonRpcRequest, JsonRpcResponse, GetBlockCountResponse},
     other::{OtherRequest, OtherResponse},
 };
-<<<<<<< HEAD
-use cuprate_rpc_interface::{RouterBuilder, RpcHandlerDummy, Request};
-||||||| 0941f68
-use cuprate_rpc_interface::{RouterBuilder, RpcHandlerDummy, RpcRequest};
-=======
 use cuprate_rpc_interface::{RouterBuilder, RpcHandlerDummy};
->>>>>>> main
 
 // Send a `/get_height` request. This endpoint has no inputs.
 async fn get_height(port: u16) -> OtherResponse {