Chicken in a Mug

When you used to have beef with someone but now things are cool.

“Yo man, me and Karl are so Chicken in a Mug now.”