void (@NotNull ThreeSide side) { executeMergeCommand(DiffBundle.message("merge.dialog.apply.non.conflicted.changes.command"), true, null, () -> { List<TextMergeChange> allChanges = new ArrayList<>(getAllChanges()); for (TextMergeChange change : allChanges) { if (!change.isConflict()) { resolveChangeAutomatically(change, side); } } }); TextMergeChange firstUnresolved = ContainerUtil.find(getAllChanges(), c -> !c.isResolved()); if (firstUnresolved != null) doScrollToChange(firstUnresolved, true); }