Bids implemented
Conflicts fixed