Fix bug in date range checks
Resolve merge issues in Carers