Added query for employee directory
Fix merge conflict