pc add base2
resolved merge