changed related columns in diy time module and updated merge algorithm accordingly