Removed unused method find_conflict_state
Merge pull request #759 from Who828/master

Removed unused method find_conflict_state