reset: Cannot soft reset with a conflicted index
Ignore clar.suite.rule
Merge pull request #1174 from nulltoken/topic/soft_reset_with_index_conflicts

Prevent soft reset when index contains conflicts