fixed that loop
fixed merge