completed searching with ransak gem and added apis
Resolving conflicts