added i variable
final add
resolved merge conflict
Stuff
longer