Added conflict detection with red backgrounds