added index
fixed merge error