Merge branch 'master' into i1118-IncreaseGasBuffer

1 files changed, 1 insertions, 1 deletions

diff --git a/app/scripts/keyring-controller.js b/app/scripts/keyring-controller.js
index 7669b9f8f..72f613641 100644
--- a/app/scripts/keyring-controller.js
+++ b/app/scripts/keyring-controller.js
@@ -188,7 +188,7 @@ class KeyringController extends EventEmitter {
       switch (type) {
         case 'Simple Key Pair':
           let isNotIncluded = !accounts.find((key) => key === newAccount[0] || key === ethUtil.stripHexPrefix(newAccount[0]))
-          return (isNotIncluded) ? Promise.resolve(newAccount) : Promise.reject(new Error('The account your are trying to import is a duplicate'))
+          return (isNotIncluded) ? Promise.resolve(newAccount) : Promise.reject(new Error('The account you\'re are trying to import is a duplicate'))
         default:
           return Promise.resolve(newAccount)
       }