formating date
merge