Are the Prince Harry and William disputes ending