fixed merge conflict, adding in empoyer