Change in b with conflict
Confirm conflict with b