'Add a new employee' function
Add 'Edit' function
Fix conficts of merging