Cadet training dispute nearly settled