few changes to fix employee
resolve merge issues