resetting the index seems to have been removed by git during merging...