Commit 9a0d59041204997005b9817a73ddc392538a0fe1

nulltoken 2012-12-27T13:42:27

reset: Cannot soft reset with a conflicted index