The beef is over. Fire and Water collabo.