* Conflicting entities view now considers secondary associations