fixing iterator
fixed merge conflict