Merge core/clock into core/dates