Phase 1 getting points back
fixed conflict