From 8feb53358c321126d71405a6815255a2777cf4fa Mon Sep 17 00:00:00 2001
From: John Firebaugh <john.firebaugh@gmail.com>
Date: Fri, 28 Jun 2013 15:46:10 -0400
Subject: [PATCH] Fix unknown entity error on merge (fixes #1618)

---
 js/id/operations/merge.js | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/js/id/operations/merge.js b/js/id/operations/merge.js
index bdef5543e..1b99c215c 100644
--- a/js/id/operations/merge.js
+++ b/js/id/operations/merge.js
@@ -15,8 +15,9 @@ iD.operations.Merge = function(selectedIDs, context) {
             action = mergePolygon;
         }
 
-        var difference = context.perform(action, annotation);
-        context.enter(iD.modes.Select(context, difference.extantIDs()));
+        context.perform(action, annotation);
+        context.enter(iD.modes.Select(context, selectedIDs.filter(function(id) { return context.hasEntity(id); }))
+            .suppressMenu(true));
     };
 
     operation.available = function() {