updated conflict scanner