Reworked conflict detection logic