added change in index
resolved merge conflict that did not exist