A night after getting put into a headlock from a bouncer at Hennessey's Tavern in Dana Point, Calif., Charlie Sheen looked like he was in good spirits as he spent time with his ex Brooke Mueller and father Martin Sheen on Sunday.

The day after the bar bust-up in the OC, Charlie sought solace from his ex wife in Malibu. The constantly feuding former spouses had a deep embrace, as their two sons Bob and Max watched. Later in the day, Chaz went over to see his father, the great Martin Sheen, and spent some time with the iconic actor.

Charlie may have knocked a woman's phone out of her hand on Saturday -- but it seems like he's all about making amends on Sunday!