Changed index
Fixed conflict