X-Git-Url: https://git.yukkurigames.com/?p=enjoyable.git;a=blobdiff_plain;f=Classes%2FNJMappingsController.m;fp=Classes%2FNJMappingsController.m;h=4a9c3fffaba6ccc82c42fde5cf827bbd10a65b00;hp=772b14ab6baab7b27ea2989f978bdd7a0ec8d88d;hb=47a530c22a3f277d11e7ddb4b0147c8f93f6f9cd;hpb=402a1b679ced5422e46c7a5caeecc45e5ed878db

diff --git a/Classes/NJMappingsController.m b/Classes/NJMappingsController.m
index 772b14a..4a9c3ff 100644
--- a/Classes/NJMappingsController.m
+++ b/Classes/NJMappingsController.m
@@ -247,6 +247,10 @@
                                      didEndSelector:@selector(mappingConflictDidResolve:returnCode:contextInfo:)
                                         contextInfo:(void *)CFBridgingRetain(@{ @"old mapping": mergeInto,
                                                                                 @"new mapping": mapping })];
+        } else if (mergeInto) {
+            [mergeInto mergeEntriesFrom:mapping];
+            [self activateMapping:mergeInto];
+            [self mappingsChanged];
         } else {
             [_mappings addObject:mapping];
             [self activateMapping:mapping];