Splash News 1 / 7

The turbulent times between exes Madonna and Guy Ritchie may be subsiding ... hurray for Rocco Ritchie!

The American pop star and the British director have been in a bitter custody battle over where their 15-year-old son Rocco should live, but things seem to be getting smoothed over as Guy was seen dropping off his teen son at his ex's London home on April 10.

Madonna appears to be keeping the pledge she made last month in the British high court to try to "heal the wounds" in her family, reports The Telegraph.

The "Sherlock Holmes" director and his new wife Jacqui Ainsley drove to Madonna's home in West London in a Land Rover Discovery 4x4. Rocco was seen exiting the car and wearing a lime green fleece, maroon pants and holding a skateboard as he arrived at his mother's home. Two hours later, he exited the home and went skateboarding with a pal.

Later in the day, Madge was photographed bicycling around London. Seems like a sporty day for mother and son -- even if they weren't doing it together!

During a private hearing in the Family Division of the High Court in London last month, Justice MacDonald urged Madonna and Guy to resolve their dispute over where their son should live outside of the courts. The judge also ruled the legal battle would be heard in a New York court, and not London. The judge's ruling meant that the feuding pair would either have to resolve their issues at a later date in the U.S. or by family conciliation.

The judge made sure to say that continuing this fight would be a "tragedy" for Rocco and his youth, which were being marred by his parents' conflict.

The judge said, "I renew, one final time, my plea for both parents to seek and to find an amicable resolution to the dispute between them." He continued, "As I observed during the course of the hearing, summer does not last forever. The boy very quickly becomes the man. It would be a very great tragedy for Rocco if any more of the previous and fast receding days of his childhood were to be taken up by this dispute."

Since the couple's divorce in December 2008, Rocco had been living with his mother in New York City and visiting his father in London. However, while touring with his mother on her Rebel Heart tour last December, the teen visited his father in London and decided that he wanted to live with him. The decision caused some major fighting between the exes, as the 57-year-old singer wanted her son back in the States.

Madonna has been doing a great deal of talking about the situation on social media, during her shows and in the courts, but it appears as though now that her Rebel Heart world tour is finally over, Madonna is making concessions so that she can spend time with her growing son, who appears happy to stay put in London Town.

We're glad they're working on working this whole thing out!