Fixing Merge Conflict

fixing it for Recruit Things