serch validated
fixed conflicts