added index
Merge resolved