updated index with sam's comments
fixed conflict