Is there an easy way to get into @phpstorm's "git merge and conflict resolution" UI if you've started the merge or rebase on the CLI? PhpStorm appears to be aware I'm in the middle of a merge, but opening the files directly just shows the inline <<<< >>>> text markers and not the nice conflict resolution view.