From 310f40fcad1cf01b285303fc1b25c1a5c1ba1179 Mon Sep 17 00:00:00 2001
From: lilia <liliakai@gmail.com>
Date: Thu, 17 Sep 2015 14:25:49 -0700
Subject: [PATCH] Contact sync should update existing contacts

// FREEBIE
---
 js/conversation_controller.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/js/conversation_controller.js b/js/conversation_controller.js
index 2699c7a85..77204f003 100644
--- a/js/conversation_controller.js
+++ b/js/conversation_controller.js
@@ -52,7 +52,7 @@
             if (typeof attrs !== 'object') {
                 throw new Error('ConversationController.create requires an object, got', attrs);
             }
-            var conversation = conversations.add(attrs);
+            var conversation = conversations.add(attrs, {merge: true});
             return conversation;
         },
         findOrCreatePrivateById: function(id) {