diff --git a/docs/guide/ibc.md b/docs/guide/ibc.md
index 6862d1b9c5..e65905f7d1 100644
--- a/docs/guide/ibc.md
+++ b/docs/guide/ibc.md
@@ -175,13 +175,8 @@ The results of a query can thus be used as proof in an `IBCPacketPostTx`.
 Now that we have all the background knowledge, let's actually walk through the tutorial.
 
 Make sure you have installed
-<<<<<<< 5be9db68dbd6a69ba886c5a6e55b90f2cecd2ca8
-[tendermint](https://tendermint.com/intro/getting-started/download) and
-[basecoin](/docs/guide/install.md).
-=======
 [Tendermint](https://tendermint.com/intro/getting-started/download) and
-[adam](/docs/guide/install.md).
->>>>>>> doc edits
+[basecoin](/docs/guide/install.md).
 
 `basecoin` is a framework for creating new cryptocurrency applications.
 
diff --git a/docs/guide/src/example-plugin/plugin.go b/docs/guide/src/example-plugin/plugin.go
index 4c0d2b3667..12f5b6a663 100644
--- a/docs/guide/src/example-plugin/plugin.go
+++ b/docs/guide/src/example-plugin/plugin.go
@@ -52,7 +52,7 @@ func NewExamplePlugin() *ExamplePlugin {
 	}
 }
 
-// Return a byte array unique to this plugin which will be used as the key which
+// Return a byte array unique to this plugin which is used as the key
 // to store the plugin state (ExamplePluginState)
 func (ep *ExamplePlugin) StateKey() []byte {
 	return []byte("ExamplePlugin.State")