Added index
Fixed conflict