‘Our rift is over and all is well’ says Kigwangalla