Allow the blame operation to run during conflicts
Merge pull request #512 from volaya/blame_conflict

Allow the blame operation to run during conflicts