void (@NotNull MergeResult result) { if (myConflictResolved || myRequest == null) return; myConflictResolved = true; try { myRequest.applyResult(result); } catch (Exception e) { LOG.warn(e); new Notification("Merge Internal Error", DiffBundle.message("can.t.finish.merge.resolve"), e.getMessage(), NotificationType.ERROR) .setDisplayId(DiffNotificationIdsHolder.MERGE_INTERNAL_ERROR) .notify(myProject); } }