Lewis Hamilton says he and Ferrari team-mate Charles Leclerc have "squashed" their incident at the Mexico City Grand Prix after holding talks in Brazil.