refact code
merged date time