search route and models added
conflicts resolved