fix tests
fix the conflict schedule list