add iteration
fix conflict