fix conflicts

4 files changed, 4 insertions, 5 deletions

diff --git a/docs/adding-new-networks.md b/docs/adding-new-networks.md
index ea1453c21..b74233fa6 100644
--- a/docs/adding-new-networks.md
+++ b/docs/adding-new-networks.md
@@ -5,7 +5,6 @@ To add another network to our dropdown menu, make sure the following files are a
 ```
 app/scripts/config.js
 app/scripts/lib/buy-eth-url.js
-app/scripts/lib/config-manager.js
 ui/app/app.js
 ui/app/components/buy-button-subview.js
 ui/app/components/drop-menu-item.js
diff --git a/docs/porting_to_new_environment.md b/docs/porting_to_new_environment.md
index 983c81f3e..d901f2b78 100644
--- a/docs/porting_to_new_environment.md
+++ b/docs/porting_to_new_environment.md
@@ -21,7 +21,7 @@ The core functionality of MetaMask all lives in what we call [The MetaMask Contr
 When calling `new MetaMask(opts)`, many platform-specific options are configured. The keys on `opts` are as follows:
 
 - initState: The last emitted state, used for restoring persistent state between sessions.
-- platform: The `platform` object defines a variety of platform-specific functions, including opening the confirmation view, and opening web sites.
+- platform: The `platform` object defines a variety of platform-specific functions, including opening the confirmation view, and opening websites.
 - encryptor - An object that provides access to the desired encryption methods.
 
 ##### Encryptor
@@ -97,5 +97,5 @@ If streams seem new and confusing to you, that's ok, they can seem strange at fi
 
 ## Conclusion
 
-I hope this has been helpful to you! If you have any other questionsm, or points you think need clarification in this guide, please [open an issue on our GitHub](https://github.com/MetaMask/metamask-plugin/issues/new)!
+I hope this has been helpful to you! If you have any other questions, or points you think need clarification in this guide, please [open an issue on our GitHub](https://github.com/MetaMask/metamask-plugin/issues/new)!
 
diff --git a/docs/state_dump.md b/docs/state_dump.md
index ecb863982..855445dca 100644
--- a/docs/state_dump.md
+++ b/docs/state_dump.md
@@ -11,5 +11,5 @@ To take a state dump, follow these steps:
 3. In case it isn't already selected, click the "Console" tab in the new Developer Tools window.
 4. In the console, type this command exactly: `logState()`. This should print a bunch of JSON text into your console.
 5. Copy that printed JSON text
-6. *Optional*: Annonymize that text if you'd like (you may change all instances of an account address to another valid account address, for example) We may automate the anonymization in the future.
+6. *Optional*: Anonymize that text if you'd like (you may change all instances of an account address to another valid account address, for example) We may automate the anonymization in the future.
 7. Send that JSON text to the developer, ideally pasting it in the issue regarding the bug.
diff --git a/docs/translating-guide.md b/docs/translating-guide.md
index 8b2bc1785..684316e4f 100644
--- a/docs/translating-guide.md
+++ b/docs/translating-guide.md
@@ -8,7 +8,7 @@ The MetaMask browser extension supports new translations added in the form of ne
 
 - Each supported language is represented by a folder in `app/_locales` whose name is that language's subtag (example: `app/_locales/es/`). (look up a language subtag using the [r12a "Find" tool](https://r12a.github.io/app-subtags/) or this [wikipedia list](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)).
 - Inside that folder there should be a `messages.json`. 
-- An easy way to start your translation is to first **make a copy** of `app/_locales/en/messages.json` (the english translation), and then **translate the `message` key** for each in-app message.
+- An easy way to start your translation is to first **make a copy** of `app/_locales/en/messages.json` (the English translation), and then **translate the `message` key** for each in-app message.
 - **The `description` key** is just to add context for what the translation is about, it **does not need to be translated**.
 - Add the language to the [locales index](https://github.com/MetaMask/metamask-extension/blob/master/app/_locales/index.json) `app/_locales/index.json`