* Fixed colspan in conflicting entities view