Conflict and resolution between editorial and advertorial content