fixing overlapping dates