Improve conflict detector