search works
fixed conflicts