catergories
conflict resolution
save button works just edit doesn't work now
With updated Employee features