Resolution Conflict Buttons Show Fighting Or Arbitration