Resolved conflict on News page