Singer Melissa Etheridge has settled her nasty two-year child support battle with her ex-girlfriend.

Etheridge and actress Tammy Lynn Michaels ended their seven-year relationship in 2010 and they've been locked in a bitter war of words over their five-year-old twins Johnnie and Miller ever since.

Last month, Michaels launched a legal battle against the Grammy Award winner, seeking a hike in monthly child custody payments, which were previously set at $23,000, but on Monday the former couple finally came to an undisclosed agreement as part of a court-ordered mediation.

According to TMZ.com, the pair will share joint custody of the kids and sources tell the site Michaels' monthly figure will be substantially higher.