Fixed Defect: Validation Errors on multiple fields
fixed merge conflict for employee