Lady Gaga and a former personal assistant who sued her won't face off in a New York trial next month after settling their differences.
The settlement in a lawsuit brought by Jennifer O'Neill was revealed in a court order dismissing the case.
O'Neill had claimed the singer cheated her out of overtime wages when she worked for her for a few weeks in early 2009 and for 13 months beginning in February 2010.
A trial was scheduled to begin next month. O'Neill had testified she was responsible for sometimes monitoring the singer's communications and for handling about 20 bags of luggage.
Court papers revealed that Gaga and O'Neill were roommates and friends on the Lower East Side of Manhattan before 2008.
Lawyers did not immediately comment.