void () { executeMergeCommand(DiffBundle.message("message.resolve.simple.conflicts.command"), true, null, () -> { List<TextMergeChange> allChanges = new ArrayList<>(getAllChanges()); for (TextMergeChange change : allChanges) { resolveChangeAutomatically(change, ThreeSide.BASE); } }); TextMergeChange firstUnresolved = ContainerUtil.find(getAllChanges(), c -> !c.isResolved()); if (firstUnresolved != null) doScrollToChange(firstUnresolved, true); }