Scholes makes peace with Carrick after jibe at former Man Utd team-mate