Attempt to fix return bikes error
Resolve merge conflicts