Commit changes to Employment Tab Update and add
fixed merge conflicts between local and remote master