Yourself and one other team member need to resolve this issue at the same time, but without merging each other's changes into your branch. Rename the variable that you iterate over in the for loop in #4.
