Updated date validation for CREATE & UPDATE
Resolved conflict for Logic
Resolved conflict after View Refactor