refactoring on Employee.
merge conflicts