Move conflict detection logic in a standalone module