Add conflict detector