job fxiing for checklist
conflict resolved