until the resolution of the dispute