Long-running pay dispute resolved with Unison