corrected date conflicts