resolved conflicts in the data type of offset and times