British driver and former World Champion Lewis Hamilton has revealed he and Mercedes teammate Nico Rosberg have cleared the air in the wake of the tension between them at the Grand Prix of Monaco.