1. Added validations for dates and types matches
1. Resolve merge conflict. All tests passed