added text to index
added text to index
fixed conflict