Conflict detector fix