void (@NotNull MergeCallback.Listener listener, @NotNull Disposable disposable) { myProject.getMessageBus().connect(disposable).subscribe(GitStagingAreaHolder.TOPIC, (repo) -> { if (myIsValid && myConflict.getRoot().equals(repo.getRoot())) { if (!checkIsValid()) { listener.fireConflictInvalid(); } } }); }