search implemented
fixed conflicts