Corrected index of characters
Resolved merge conflict