date range picker
resolve conflict