Search logic changed
Conficts resolved