Mother and daughter finally lay their feud to rest.