Home Off Beat Jolie ends rift with father Voight