updates to index to remove conflicts