fix link to create news
fix conflict