merge
Fixed bug in matched_ride request
merge