update news informer
merge with remote master and resolve merge conflicts