Fix merge conflicts.

1 files changed, 2 insertions, 1 deletions

diff --git a/app/scripts/lib/message-manager.js b/app/scripts/lib/message-manager.js
index ceaf8ee2f..711d5f159 100644
--- a/app/scripts/lib/message-manager.js
+++ b/app/scripts/lib/message-manager.js
@@ -33,6 +33,7 @@ module.exports = class MessageManager extends EventEmitter{
       msgParams: msgParams,
       time: time,
       status: 'unapproved',
+      type: 'eth_sign',
     }
     this.addMsg(msgData)
 
@@ -115,4 +116,4 @@ function normalizeMsgData(data) {
     // data is unicode, convert to hex
     return ethUtil.bufferToHex(new Buffer(data, 'utf8'))
   }
-}
\ No newline at end of file
+}