Chris Brown and Nia Guzman have agreed to put their bitter feud aside and work together to raise their year-old daughter.

Word is the two recently came together to hash out a plan aimed at co-parenting daughter Royalty in better harmony. According to TMZ, as part of the peace plan, the two have agreed to accompany their daughter together for such outings as swim lessons, gymnastics and dance classes.

The pact would seem to put an end to a battle that has raged between them for months, and which recently found them squaring off in court against one another, where proceedings ended with Brown being granted joint custody.

Not all the "Loyal" singer's recent efforts at maintaining peace have proved to be as successful.

He and ex-girlfriend Karrueche Tran have continued to openly beef, with some from Brown's camp recently arguing "she should be thanking him for making her famous."

The barbs began to fly after Tran told reporters the nature of their volatile relationship has affected her work.

"I used to date him, and now as I am growing into myself and maturing and getting my career together, I am starting to have my own name without having to be associated," she told BBC Newsbeat of the man who has also infamously dated Rihanna.

"Let's be clear about it, there would be no Karrueche Tran if she hadn't dated Chris Brown," s source close to Brown retorted. "The world would not know who Karrueche Tran is if she didn't inject herself into Chris' life after the Rihanna incident."

The two split after it was revealed Brown had fathered a child with Guzman behind Tran's back. Tran added the two are no longer in touch and that she has put all the "negative stuff" behind her.