return CONFLICT;
return result;
  public int linesEqual(Logger logger,			ResultSet rs1, boolean hasLine1, 			ResultSet rs2, boolean hasLine2,			int columns) {    if (!hasLine1 && !hasLine2) return EQUALTO;    if (!hasLine1 && hasLine2) return GREATERTHAN;    if (hasLine1 && !hasLine2) return LESSTHAN;    int [] types = getTypes ();    int result = columnCompare(logger, rs1, rs2, UNIT);    if (result != EQUALTO) {	return CONFLICT;    }    result = columnCompare(logger, rs1, rs2, MOVED);    if (result != EQUALTO) {	return CONFLICT;    }    return result;  }