Fix bug for conflict finding