According to People.com, Chris Brown and Rihanna have made up and are back together.  It seems the couple have worked out their differences and are currently shacked up in Diddy’s Miami Beach home.

The pair have reunited almost three weeks after Brown, 19, allegedly battered the “Umbrella” singer on Feb. 8, a source tells PEOPLE.

“They’re together again. They care for each other,” says the source. The on-again couple are currently spending time together at one of Sean “Diddy” Combs’s homes, on Miami Beach’s Star Island.

Adds the source: “While Chris is reflective and saddened about what happened, he is really happy to be with the woman he loves.”