resolved news conflict