fix error on bid proposal
resolve conflict