update view of year task
merge master
fix the merge