Nigel Gaisie, Afia Schwarzenegger finally bury the hatchet