fixed sort by date
merge conflict