* fix issue where conflicts weren't being handled * Instead of using on collision, alter the daily_range * move tests to appropriate file * Apply suggestions from code review Co-authored-by: Michael Gaffney <mike@gaffney.cc> --------- Co-authored-by: Michael Gaffney <mike@gaffney.cc>