package com.microsoft.alm.plugin.idea.tfvc.core.tfs.conflicts;
import com.intellij.openapi.project.Project;
<BUG>import com.microsoft.alm.plugin.external.models.RenameConflict;</BUG>
import com.microsoft.alm.plugin.idea.tfvc.ui.resolve.MergeNameDialog;
import org.jetbrains.annotations.Nullable;
public class DialogNameMerger implements NameMerger {
@Nullable
<BUG>public String mergeName(final RenameConflict conflict, Project project) {
final MergeNameDialog dialog = new MergeNameDialog(conflict.getLocalPath(), conflict.getServerPath(), project);
if (dialog.showAndGet()) {</BUG>
return dialog.getSelectedPath();

package com.microsoft.alm.plugin.idea.tfvc.core.tfs.conflicts;
import com.intellij.openapi.project.Project;
import com.microsoft.alm.plugin.idea.tfvc.ui.resolve.MergeNameDialog;
import org.jetbrains.annotations.Nullable;
public class DialogNameMerger implements NameMerger {
@Nullable
public String mergeName(final String nameChoice1, final String nameChoice2, final Project project) {
final MergeNameDialog dialog = new MergeNameDialog(nameChoice1, nameChoice2, project);
if (dialog.showAndGet()) {
return dialog.getSelectedPath();
