fix news date problem
fix conflict