find and first
conflict fix