Date Validation in ticket
Conflicts resolved