add employee to task update
merge
fix merge problem