polishing
conflict check