news page
fix conflicts