date bug
merge