start/end date fix
merge