[Master] Resolved merge conflict in index