Update auto-bidding-tests.txt

conflict resolution