diff --git a/js/id/actions/merge_remote_changes.js b/js/id/actions/merge_remote_changes.js index 71341a643..c81a69ad6 100644 --- a/js/id/actions/merge_remote_changes.js +++ b/js/id/actions/merge_remote_changes.js @@ -93,7 +93,7 @@ iD.actions.MergeRemoteChanges = function(id, localGraph, remoteGraph) { fail = false; function ignoreKey(k) { - return k.indexOf('tiger:') === 0 || _.contains(iD.data.discarded, k); + return _.contains(iD.data.discarded, k); } for (var i = 0; i < keys.length; i++) {