if (isMergeConflict(conflict, null)) {
final String workingFolder = localPath.isDirectory() ?
localPath.getPath() :
localPath.getParentPath().getPath();
final MergeConflict mergeConflict = (MergeConflict) conflict;
<BUG>final VersionSpec baseVersion = CommandUtils.getBaseVersion(
context, workingFolder, mergeConflict.getOldPath(), mergeConflict.getServerPath());
original = TFSContentRevision.createRenameRevision(project, context, localPath,
SystemHelper.toInt(baseVersion.getValue(), 1), originalChange.getDate(), mergeConflict.getOldPath()).getContent();
</BUG>
serverChanges = TFSContentRevision.createRenameRevision(project, context, localPath,

if (isMergeConflict(conflict, null)) {
final String workingFolder = localPath.isDirectory() ?
localPath.getPath() :
localPath.getParentPath().getPath();
final MergeConflict mergeConflict = (MergeConflict) conflict;
final String sourcePath = mergeConflict.getMapping().getFromServerItem();
final String targetPath = mergeConflict.getMapping().getToServerItem();
final VersionSpec baseVersion = CommandUtils.getBaseVersion(context, workingFolder, sourcePath, targetPath);
original = TFSContentRevision.createRenameRevision(project, context, localPath,
SystemHelper.toInt(baseVersion.getValue(), 1), originalChange.getDate(), sourcePath).getContent();
