Fix the for loop
Fix the merge and the for loop