daterangies
merge conflict