prediction done
resolved merge conflicts