pallo to ride conversion
pallo to ride conversion
fixed code sample
fixed merge conflict