dispute settled