Fix merging conflicts
Merge pull request #9 from thelabtech/SITRACK-90

Handle profile for Part Time Field Staff intern type