NAACP ends boycott