Tax dispute settled