fixed diffNaive accuracy
resolved merge issues