Conflict between Halima Poland and Prince Walid Bin Talal has ended