fixed the bug for no data when swtich year
merge conflict and build