Fixes bid on auction
Fix merge