narrow search
fix conflict