squash the beef

Translations
урегулировать конфликт
They decided to squash the beef and move on with their friendship.
Они решили урегулировать конфликт и продолжить дружбу.
Definitions
To resolve a disagreement or conflict between people; to make peace and end hostilities.