solve conflict
sale and bid item et all
modify some files