change 'conflict' to 'dispute', add 'ad-hoc'