HOT FIX: index copy updated
resolved merge conflict