solved cs conflicts, some job posting stuff