updated index
fixed conflict