Chris Brown and Nia Guzman, the mother of his daughter, Royalty, have reportedly buried the hatchet after fighting over everything from money to a custody agreement.

Last month, the “Fine China” singer was awarded joint custody of their 1-year-old daughter, getting her half of the time.

He has previously criticized her for seeking $15,000 a month in child support, which prompted him to tweet in August, “Some men my age run from their responsibility as fathers. I embrace mine. Just sucks that some females use children as meal tickets.”

According to TMZ, they have reportedly made up in a recent meeting, during which they agreed to co-parent their daughter amicably. Now that they both live in Los Angeles full time, they’ve reportedly decided to take Royalty to activities such as dance classes and swimming lessons together.

Back in August Brown also tweeted, “Using a child as leverage is never ok. The highest praise to the men who actually want their kids.”