private void appendConflict(@Nls final String conflict) {
    if (myConflict == null) {
      myConflict = conflict;
    } else {
      myConflict += "\n" + conflict;
    }
  }
private void appendConflict(@Nls final String conflict)