fixed forEach
fixed merge conflict