Update EmployeesController.cs
resolved merge conflict