An accord has been reached