squashed beef
To get rid of any past beef or drama that went down between two people and to get onto good terms with, typically used between an ex-SO
I saw my ex last night and we squashed beef so we are cool now.