reward progress
Fix conflicts
Score Label