changed i to j
changed i to k
kept j not k resolved conflict