Actual fix for merge errors with selecting an end date