A court official announced on Wednesday that singer Madonna and her ex-husband Guy Ritchie have settled a child custody dispute over their 16-year-old son Rocco. It hasn't been revealed which parent Rocco will live with. The couple have been in a legal battle since December, when Rocco ignored a court order to fly back to Madonna's home in New York. When the couple divorced in 2008 they agreed that Rocco would live with Madonna.