correcting bug date month>10
merge conflict