fix date
merge