original = TFSContentRevision.createRenameRevision(project, context, localPath,
SystemHelper.toInt(baseVersion.getValue(), 1), originalChange.getDate(), mergeConflict.getOldPath()).getContent();
</BUG>
serverChanges = TFSContentRevision.createRenameRevision(project, context, localPath,
<BUG>getMergeFromVersion(mergeConflict), originalChange.getDate(), mergeConflict.getOldPath()).getContent();
</BUG>
myLocalChanges = CurrentContentRevision.create(localPath).getContent();
} else {
if (originalChange != null) {
final int version = Integer.parseInt(originalChange.getVersion());

original = TFSContentRevision.createRenameRevision(project, context, localPath,
SystemHelper.toInt(baseVersion.getValue(), 1), originalChange.getDate(), sourcePath).getContent();
serverChanges = TFSContentRevision.createRenameRevision(project, context, localPath,
getMergeFromVersion(mergeConflict), originalChange.getDate(), sourcePath).getContent();
myLocalChanges = CurrentContentRevision.create(localPath).getContent();
} else {
if (originalChange != null) {
final int version = Integer.parseInt(originalChange.getVersion());
