resolved merge bug in newsserver