edited index in master
snd change
merged index and master with merge error