call number patch part 4 -- resolve conflict with another DB schema change