added different secretary and employee
comment
fixed merge conflicts