different changes to index to try and create a merge conflict