Apple settles with Apple in long-running trademark battle