error in the iteration
error in the iteration, conflic fix