userBar search function change blade
conflict merge