Manchester United manager Ralf Rangnick said his disagreement with Anthony Martial over whether he was available to face Aston Villa is "resolved."