Fix typos

Author: sij411

docs/manual/relay.md

@@ -222,7 +222,6 @@ Return `true` to approve or `false` to reject.  Rejected requests receive a
 Managing followers
 ------------------
 
-<<<<<<< HEAD
 The relay provides methods to query and manage followers through the `Relay`
 interface.
 
@@ -322,7 +321,6 @@ for await (const entry of kv.list(["follower"])) {
 }
 ~~~~
 
->>>>>>> cbb51460362eba2c9ccf5d639f9d25899bad64a4
 
 Storage requirements
 --------------------