* correct the iteration>1 for training
* conflict resolved