Haas driver Romain Grosjean says he has had positive talks with Lewis Hamilton and resolved their differences regarding the drivers' anti-racism protests.