test prediction
conflict resolve