private void reportConflict(FilePath filepath) {
    ContentRevision before = GitContentRevision.createRevision(filepath, myHead, myProject);
    ContentRevision after = GitContentRevision.createRevision(filepath, null, myProject);
    reportChange(FileStatus.MERGED_WITH_CONFLICTS, before, after);
  }
private void reportConflict(FilePath filepath)