fixex date againt
merge