edited model_iteration

Removed conflicts in model iteration